From c8f0a4e3085c849c2eb7213a0aa7b37487c1ccda Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 1 May 2026 15:29:05 +0100 Subject: [PATCH 01/41] Add dispatch method using cost-minimising supply Co-authored-by: Copilot --- src/muse/production.py | 19 +++++++++ src/muse/quantities.py | 93 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) diff --git a/src/muse/production.py b/src/muse/production.py index c6eaea4a2..cdb420e0e 100644 --- a/src/muse/production.py +++ b/src/muse/production.py @@ -107,3 +107,22 @@ def supply( return supply( capacity, market.consumption, technologies, timeslice_level=timeslice_level ) + + +@register_production +def cost_minimising_supply( + market: xr.Dataset, + capacity: xr.DataArray, + technologies: xr.Dataset, + timeslice_level: str | None = None, +) -> xr.DataArray: + """Service current demand from the cheapest assets.""" + from muse.quantities import cost_minimising_supply + + return cost_minimising_supply( + capacity, + market.consumption, + technologies, + prices=market.prices, + timeslice_level=timeslice_level, + ) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index f822739d1..63bb0f35a 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -98,6 +98,99 @@ def supply( return result +def cost_minimising_supply( + capacity: xr.DataArray, + demand: xr.DataArray, + technologies: xr.Dataset | xr.DataArray, + prices: xr.DataArray, + timeslice_level: str | None = None, +) -> xr.DataArray: + from muse.commodities import CommodityUsage, check_usage, is_pollutant + from muse.costs import levelized_cost_of_energy + + assert "asset" not in demand.dims + assert "asset" in capacity.dims + + # Maximum and minimum production for each asset + maxprod = maximum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + minprod = minimum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + + # Consumption of each asset assuming full dispatch, for calculating costs later on. + maxcons = consumption( + technologies, maxprod, prices=prices, timeslice_level=timeslice_level + ) + + # All assets operate at at least their minimum production + result = minprod.copy() + + # Normalise region dimension + if len(set(maxprod.region.values.flatten())) == 1: + if "region" in demand.dims: + demand = demand.sel(region=maxprod.region) + prices = prices.sel(region=maxprod.region) + else: + raise ValueError( + "cost_minimising_supply not yet supported in multi-reigon models" + ) + + # Set capital costs to zero so they're not included in the cost-minimisation + technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) + + for y in maxprod.year.values: + # Calculate timeslice-level costs for each asset in this year assuming full + # dispatch. We use LCOE excluding capital costs. + technology_costs = levelized_cost_of_energy( + technologies, + prices.sel(year=y), + capacity.sel(year=y), + production=maxprod.sel(year=y), + consumption=maxcons.sel(year=y), + ) + + # Meet supply in each timeslice by utilising the cheapest assets first, up to + # their maximum production + for ts in maxprod.timeslice.values: + # Remaining demand after minimum production (i.e. what we need to meet with + # the available headroom above minimum) + remaining = demand.sel(year=y, timeslice=ts) - minprod.sel( + year=y, timeslice=ts + ).sum("asset") + + # Rank assets by cost (cheapest first) + costs_ts = technology_costs.sel(timeslice=ts) + order = costs_ts.sortby(costs_ts).asset + + # Available extra production above minimum, sorted by cost + available = (maxprod - minprod).sel(year=y, timeslice=ts).sel(asset=order) + + # cumsum_before[i] = total available production of all assets cheaper than + # i + cumsum_before = available.cumsum("asset") - available + + # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets + # are fully utilised. Clipping to [0, available[i]] ensures we never + # produce negative amounts or exceed this asset's headroom above minprod. + addition = (remaining - cumsum_before).clip(min=0, max=available) + result.loc[dict(year=y, timeslice=ts)] += addition.reindex( + asset=result.asset.values + ) + + # Add production of environmental pollutants + env = is_pollutant(technologies.comm_usage) + result[{"commodity": env}] = emission( + result, technologies, timeslice_level=timeslice_level + ).transpose(*result.dims) + result[ + {"commodity": ~check_usage(technologies.comm_usage, CommodityUsage.PRODUCT)} + ] = 0 + + return result + + def emission( production: xr.DataArray, technologies: xr.Dataset, From 2575ce80bb0604d6ef41f3425ff428bfce6e5c40 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 13:33:54 +0100 Subject: [PATCH 02/41] Tidy-ups to dispatch module --- src/muse/{production.py => dispatch.py} | 14 ++++++------- src/muse/outputs/mca.py | 9 ++++---- src/muse/quantities.py | 28 +++++++++++++------------ src/muse/sectors/sector.py | 4 ++-- 4 files changed, 28 insertions(+), 27 deletions(-) rename src/muse/{production.py => dispatch.py} (93%) diff --git a/src/muse/production.py b/src/muse/dispatch.py similarity index 93% rename from src/muse/production.py rename to src/muse/dispatch.py index cdb420e0e..bbacce1bf 100644 --- a/src/muse/production.py +++ b/src/muse/dispatch.py @@ -37,7 +37,7 @@ def production( "factory", "maximum_production", "register_production", - "supply", + "share_based_supply", ] from collections.abc import MutableMapping @@ -68,7 +68,7 @@ def register_production(function: PRODUCTION_SIGNATURE): def factory(name) -> PRODUCTION_SIGNATURE: - from muse.production import PRODUCTION_METHODS + from muse.dispatch import PRODUCTION_METHODS return PRODUCTION_METHODS[name] @@ -91,7 +91,7 @@ def maximum_production( @register_production(name=("share", "shares")) -def supply( +def share_based_supply( market: xr.Dataset, capacity: xr.DataArray, technologies: xr.Dataset, @@ -109,17 +109,17 @@ def supply( ) -@register_production -def cost_minimising_supply( +@register_production(name=("merit", "merit_order")) +def merit_order_supply( market: xr.Dataset, capacity: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None, ) -> xr.DataArray: """Service current demand from the cheapest assets.""" - from muse.quantities import cost_minimising_supply + from muse.quantities import merit_order_supply - return cost_minimising_supply( + return merit_order_supply( capacity, market.consumption, technologies, diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 66bc35cab..7ff2700b7 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -194,8 +194,7 @@ def sector_fuel_costs( ) -> pd.DataFrame: """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel - from muse.production import supply - from muse.quantities import consumption + from muse.quantities import consumption, supply data_sector: list[xr.DataArray] = [] technologies = getattr(sector, "technologies", []) @@ -215,8 +214,8 @@ def sector_fuel_costs( ).fillna(0.0) production = supply( - agent_market, capacity, + agent_market.consumption, technologies, ) @@ -298,7 +297,7 @@ def sector_emission_costs( ) -> pd.DataFrame: """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant - from muse.production import supply + from muse.quantities import supply data_sector: list[xr.DataArray] = [] technologies = getattr(sector, "technologies", []) @@ -324,8 +323,8 @@ def sector_emission_costs( red_envs = envs[i].commodity.values prices = a.filter_input(market.prices, year=year, commodity=red_envs) production = supply( - agent_market, capacity, + agent_market.consumption, technologies, ) diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 63bb0f35a..59860b5b2 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -23,12 +23,16 @@ def supply( ) -> xr.DataArray: """Production and emission for a given capacity servicing a given demand. - Supply includes two components, end-uses outputs and environmental pollutants. The - former consists of the demand that the current capacity is capable of servicing. - Where there is excess capacity, then service is assigned to each asset a share of - the maximum production (e.g. utilization across similar assets is the same in - percentage). Then, environmental pollutants are computing as a function of - commodity outputs. + This method distributes the demand across assets in proportion to their maximum + production. For example, if asset A can produce 10 units at full capacity and asset + B can produce 20 units, then A will service 1/3 of the total demand and B will + service 2/3of the total demand. If demand is lower than total maximum production, + then the supply from each asset is reduced proportionally. If demand exceeds + capacity, production is capped at each asset's maximum. + + This function is most appropriate for sectors where demand is inherently + distributed across assets and cannot be shifted between them (e.g. + residential heating systems, where each household meets its own demand). Arguments: capacity: number/quantity of assets that can service the demand @@ -98,7 +102,7 @@ def supply( return result -def cost_minimising_supply( +def merit_order_supply( capacity: xr.DataArray, demand: xr.DataArray, technologies: xr.Dataset | xr.DataArray, @@ -124,22 +128,20 @@ def cost_minimising_supply( technologies, maxprod, prices=prices, timeslice_level=timeslice_level ) - # All assets operate at at least their minimum production - result = minprod.copy() - # Normalise region dimension if len(set(maxprod.region.values.flatten())) == 1: if "region" in demand.dims: demand = demand.sel(region=maxprod.region) prices = prices.sel(region=maxprod.region) else: - raise ValueError( - "cost_minimising_supply not yet supported in multi-reigon models" - ) + raise ValueError("merit_order_supply not yet supported in multi-region models") # Set capital costs to zero so they're not included in the cost-minimisation technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) + # All assets operate at at least their minimum production + result = minprod.copy() + for y in maxprod.year.values: # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 0c437042a..9b70d3cd7 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -10,7 +10,7 @@ import xarray as xr from muse.agents import AbstractAgent -from muse.production import PRODUCTION_SIGNATURE +from muse.dispatch import PRODUCTION_SIGNATURE from muse.readers.toml import read_technodata from muse.sectors.abstract import AbstractSector from muse.sectors.register import register_sector @@ -24,9 +24,9 @@ class Sector(AbstractSector): # type: ignore @classmethod def factory(cls, name: str, settings: Any) -> Sector: + from muse.dispatch import factory as pfactory from muse.interactions import factory as interaction_factory from muse.outputs.sector import factory as ofactory - from muse.production import factory as pfactory # Read sector settings sector_settings = getattr(settings.sectors, name)._asdict() From ce6c22da7ec51543c18e19c7ea887eaff4d674ac Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 13:55:14 +0100 Subject: [PATCH 03/41] Move core code to dispatch module --- src/muse/dispatch.py | 194 +++++++++++++++++++++++++++++++++++++-- src/muse/outputs/mca.py | 13 ++- src/muse/quantities.py | 178 ----------------------------------- tests/test_dispatch.py | 93 +++++++++++++++++++ tests/test_quantities.py | 58 ------------ 5 files changed, 290 insertions(+), 246 deletions(-) create mode 100644 tests/test_dispatch.py diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index bbacce1bf..9a5118cf8 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -43,6 +43,7 @@ def production( from collections.abc import MutableMapping from typing import Callable +import numpy as np import xarray as xr from muse.registration import registrator @@ -102,9 +103,7 @@ def share_based_supply( "Equally" means that equivalent technologies are used to the same percentage of their respective capacity. """ - from muse.quantities import supply - - return supply( + return _share_based_supply_internal( capacity, market.consumption, technologies, timeslice_level=timeslice_level ) @@ -117,12 +116,195 @@ def merit_order_supply( timeslice_level: str | None = None, ) -> xr.DataArray: """Service current demand from the cheapest assets.""" - from muse.quantities import merit_order_supply - - return merit_order_supply( + return _merit_order_supply_internal( capacity, market.consumption, technologies, prices=market.prices, timeslice_level=timeslice_level, ) + + +def _share_based_supply_internal( + capacity: xr.DataArray, + demand: xr.DataArray, + technologies: xr.Dataset | xr.DataArray, + timeslice_level: str | None = None, +) -> xr.DataArray: + """Production and emission for a given capacity servicing a given demand. + + This method distributes the demand across assets in proportion to their maximum + production. For example, if asset A can produce 10 units at full capacity and asset + B can produce 20 units, then A will service 1/3 of the total demand and B will + service 2/3of the total demand. If demand is lower than total maximum production, + then the supply from each asset is reduced proportionally. If demand exceeds + capacity, production is capped at each asset's maximum. + + This function is most appropriate for sectors where demand is inherently + distributed across assets and cannot be shifted between them (e.g. + residential heating systems, where each household meets its own demand). + + Arguments: + capacity: number/quantity of assets that can service the demand + demand: amount of each end-use required. The supply of each process will not + exceed its share of the demand. + technologies: factors bindings the capacity of an asset with its production of + commodities and environmental pollutants. + timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + + Return: + A data array where the commodity dimension only contains actual outputs (i.e. no + input commodities). + """ + from muse.commodities import CommodityUsage, check_usage, is_pollutant + from muse.quantities import emission, maximum_production, minimum_production + from muse.utilities import broadcast_over_assets + + assert "asset" not in demand.dims + assert "asset" in capacity.dims + + # Maximum and minimum production for each asset + maxprod = maximum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + minprod = minimum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + + # Split commodity-level demands over assets in proportion to maxprod + if len(set(maxprod.region.values.flatten())) == 1: + # Single region models + if "region" in demand.dims: + demand = demand.sel(region=maxprod.region) + share_by_asset = maxprod / maxprod.sum("asset") + demand_by_asset = (demand * share_by_asset).fillna(0) + + elif "dst_region" in maxprod.dims: + # Trade models + demand = demand.rename(region="dst_region") + total_maxprod_by_dst_region = maxprod.groupby("dst_region").sum(dim="asset") + share_by_asset = maxprod / total_maxprod_by_dst_region + demand_by_asset = (demand * share_by_asset).fillna(0) + # TODO: Haven't verified that this is correct - to examine in the future + + else: + # Multi-region models + demand = broadcast_over_assets(demand, maxprod, installed_as_year=False) + total_maxprod_by_region = maxprod.groupby("region").sum(dim="asset") + share_by_asset = maxprod / broadcast_over_assets( + total_maxprod_by_region, maxprod, installed_as_year=False + ) + demand_by_asset = (demand * share_by_asset).fillna(0) + + # Supply is equal to demand, bounded between minprod and maxprod + assert "asset" in demand_by_asset.dims + result = np.minimum(demand_by_asset, maxprod) + result = np.maximum(result, minprod) + + # Add production of environmental pollutants + env = is_pollutant(technologies.comm_usage) + result[{"commodity": env}] = emission( + result, technologies, timeslice_level=timeslice_level + ).transpose(*result.dims) + result[ + {"commodity": ~check_usage(technologies.comm_usage, CommodityUsage.PRODUCT)} + ] = 0 + + return result + + +def _merit_order_supply_internal( + capacity: xr.DataArray, + demand: xr.DataArray, + technologies: xr.Dataset | xr.DataArray, + prices: xr.DataArray, + timeslice_level: str | None = None, +) -> xr.DataArray: + from muse.commodities import CommodityUsage, check_usage, is_pollutant + from muse.costs import levelized_cost_of_energy + from muse.quantities import ( + consumption, + emission, + maximum_production, + minimum_production, + ) + + assert "asset" not in demand.dims + assert "asset" in capacity.dims + + # Maximum and minimum production for each asset + maxprod = maximum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + minprod = minimum_production( + technologies, capacity, timeslice_level=timeslice_level + ) + + # Consumption of each asset assuming full dispatch, for calculating costs later on. + maxcons = consumption( + technologies, maxprod, prices=prices, timeslice_level=timeslice_level + ) + + # Normalise region dimension + if len(set(maxprod.region.values.flatten())) == 1: + if "region" in demand.dims: + demand = demand.sel(region=maxprod.region) + prices = prices.sel(region=maxprod.region) + else: + raise ValueError("merit_order_supply not yet supported in multi-region models") + + # Set capital costs to zero so they're not included in the cost-minimisation + technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) + + # All assets operate at at least their minimum production + result = minprod.copy() + + for y in maxprod.year.values: + # Calculate timeslice-level costs for each asset in this year assuming full + # dispatch. We use LCOE excluding capital costs. + technology_costs = levelized_cost_of_energy( + technologies, + prices.sel(year=y), + capacity.sel(year=y), + production=maxprod.sel(year=y), + consumption=maxcons.sel(year=y), + ) + + # Meet supply in each timeslice by utilising the cheapest assets first, up to + # their maximum production + for ts in maxprod.timeslice.values: + # Remaining demand after minimum production (i.e. what we need to meet with + # the available headroom above minimum) + remaining = demand.sel(year=y, timeslice=ts) - minprod.sel( + year=y, timeslice=ts + ).sum("asset") + + # Rank assets by cost (cheapest first) + costs_ts = technology_costs.sel(timeslice=ts) + order = costs_ts.sortby(costs_ts).asset + + # Available extra production above minimum, sorted by cost + available = (maxprod - minprod).sel(year=y, timeslice=ts).sel(asset=order) + + # cumsum_before[i] = total available production of all assets cheaper than + # i + cumsum_before = available.cumsum("asset") - available + + # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets + # are fully utilised. Clipping to [0, available[i]] ensures we never + # produce negative amounts or exceed this asset's headroom above minprod. + addition = (remaining - cumsum_before).clip(min=0, max=available) + result.loc[dict(year=y, timeslice=ts)] += addition.reindex( + asset=result.asset.values + ) + + # Add production of environmental pollutants + env = is_pollutant(technologies.comm_usage) + result[{"commodity": env}] = emission( + result, technologies, timeslice_level=timeslice_level + ).transpose(*result.dims) + result[ + {"commodity": ~check_usage(technologies.comm_usage, CommodityUsage.PRODUCT)} + ] = 0 + + return result diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 7ff2700b7..fe69fe696 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -194,7 +194,10 @@ def sector_fuel_costs( ) -> pd.DataFrame: """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel - from muse.quantities import consumption, supply + from muse.dispatch import ( + _share_based_supply_internal, + ) # TODO: should not have to recalculate supply + from muse.quantities import consumption data_sector: list[xr.DataArray] = [] technologies = getattr(sector, "technologies", []) @@ -213,7 +216,7 @@ def sector_fuel_costs( year=year, ).fillna(0.0) - production = supply( + production = _share_based_supply_internal( capacity, agent_market.consumption, technologies, @@ -297,7 +300,9 @@ def sector_emission_costs( ) -> pd.DataFrame: """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant - from muse.quantities import supply + from muse.dispatch import ( + _share_based_supply_internal, + ) # TODO: should not have to recalculate supply data_sector: list[xr.DataArray] = [] technologies = getattr(sector, "technologies", []) @@ -322,7 +327,7 @@ def sector_emission_costs( i = (np.where(envs))[0][0] red_envs = envs[i].commodity.values prices = a.filter_input(market.prices, year=year, commodity=red_envs) - production = supply( + production = _share_based_supply_internal( capacity, agent_market.consumption, technologies, diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 59860b5b2..4b8ee3230 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -15,184 +15,6 @@ from muse.timeslices import broadcast_timeslice, distribute_timeslice -def supply( - capacity: xr.DataArray, - demand: xr.DataArray, - technologies: xr.Dataset | xr.DataArray, - timeslice_level: str | None = None, -) -> xr.DataArray: - """Production and emission for a given capacity servicing a given demand. - - This method distributes the demand across assets in proportion to their maximum - production. For example, if asset A can produce 10 units at full capacity and asset - B can produce 20 units, then A will service 1/3 of the total demand and B will - service 2/3of the total demand. If demand is lower than total maximum production, - then the supply from each asset is reduced proportionally. If demand exceeds - capacity, production is capped at each asset's maximum. - - This function is most appropriate for sectors where demand is inherently - distributed across assets and cannot be shifted between them (e.g. - residential heating systems, where each household meets its own demand). - - Arguments: - capacity: number/quantity of assets that can service the demand - demand: amount of each end-use required. The supply of each process will not - exceed its share of the demand. - technologies: factors bindings the capacity of an asset with its production of - commodities and environmental pollutants. - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - - Return: - A data array where the commodity dimension only contains actual outputs (i.e. no - input commodities). - """ - from muse.commodities import CommodityUsage, check_usage, is_pollutant - from muse.utilities import broadcast_over_assets - - assert "asset" not in demand.dims - assert "asset" in capacity.dims - - # Maximum and minimum production for each asset - maxprod = maximum_production( - technologies, capacity, timeslice_level=timeslice_level - ) - minprod = minimum_production( - technologies, capacity, timeslice_level=timeslice_level - ) - - # Split commodity-level demands over assets in proportion to maxprod - if len(set(maxprod.region.values.flatten())) == 1: - # Single region models - if "region" in demand.dims: - demand = demand.sel(region=maxprod.region) - share_by_asset = maxprod / maxprod.sum("asset") - demand_by_asset = (demand * share_by_asset).fillna(0) - - elif "dst_region" in maxprod.dims: - # Trade models - demand = demand.rename(region="dst_region") - total_maxprod_by_dst_region = maxprod.groupby("dst_region").sum(dim="asset") - share_by_asset = maxprod / total_maxprod_by_dst_region - demand_by_asset = (demand * share_by_asset).fillna(0) - # TODO: Haven't verified that this is correct - to examine in the future - - else: - # Multi-region models - demand = broadcast_over_assets(demand, maxprod, installed_as_year=False) - total_maxprod_by_region = maxprod.groupby("region").sum(dim="asset") - share_by_asset = maxprod / broadcast_over_assets( - total_maxprod_by_region, maxprod, installed_as_year=False - ) - demand_by_asset = (demand * share_by_asset).fillna(0) - - # Supply is equal to demand, bounded between minprod and maxprod - assert "asset" in demand_by_asset.dims - result = np.minimum(demand_by_asset, maxprod) - result = np.maximum(result, minprod) - - # Add production of environmental pollutants - env = is_pollutant(technologies.comm_usage) - result[{"commodity": env}] = emission( - result, technologies, timeslice_level=timeslice_level - ).transpose(*result.dims) - result[ - {"commodity": ~check_usage(technologies.comm_usage, CommodityUsage.PRODUCT)} - ] = 0 - - return result - - -def merit_order_supply( - capacity: xr.DataArray, - demand: xr.DataArray, - technologies: xr.Dataset | xr.DataArray, - prices: xr.DataArray, - timeslice_level: str | None = None, -) -> xr.DataArray: - from muse.commodities import CommodityUsage, check_usage, is_pollutant - from muse.costs import levelized_cost_of_energy - - assert "asset" not in demand.dims - assert "asset" in capacity.dims - - # Maximum and minimum production for each asset - maxprod = maximum_production( - technologies, capacity, timeslice_level=timeslice_level - ) - minprod = minimum_production( - technologies, capacity, timeslice_level=timeslice_level - ) - - # Consumption of each asset assuming full dispatch, for calculating costs later on. - maxcons = consumption( - technologies, maxprod, prices=prices, timeslice_level=timeslice_level - ) - - # Normalise region dimension - if len(set(maxprod.region.values.flatten())) == 1: - if "region" in demand.dims: - demand = demand.sel(region=maxprod.region) - prices = prices.sel(region=maxprod.region) - else: - raise ValueError("merit_order_supply not yet supported in multi-region models") - - # Set capital costs to zero so they're not included in the cost-minimisation - technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) - - # All assets operate at at least their minimum production - result = minprod.copy() - - for y in maxprod.year.values: - # Calculate timeslice-level costs for each asset in this year assuming full - # dispatch. We use LCOE excluding capital costs. - technology_costs = levelized_cost_of_energy( - technologies, - prices.sel(year=y), - capacity.sel(year=y), - production=maxprod.sel(year=y), - consumption=maxcons.sel(year=y), - ) - - # Meet supply in each timeslice by utilising the cheapest assets first, up to - # their maximum production - for ts in maxprod.timeslice.values: - # Remaining demand after minimum production (i.e. what we need to meet with - # the available headroom above minimum) - remaining = demand.sel(year=y, timeslice=ts) - minprod.sel( - year=y, timeslice=ts - ).sum("asset") - - # Rank assets by cost (cheapest first) - costs_ts = technology_costs.sel(timeslice=ts) - order = costs_ts.sortby(costs_ts).asset - - # Available extra production above minimum, sorted by cost - available = (maxprod - minprod).sel(year=y, timeslice=ts).sel(asset=order) - - # cumsum_before[i] = total available production of all assets cheaper than - # i - cumsum_before = available.cumsum("asset") - available - - # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets - # are fully utilised. Clipping to [0, available[i]] ensures we never - # produce negative amounts or exceed this asset's headroom above minprod. - addition = (remaining - cumsum_before).clip(min=0, max=available) - result.loc[dict(year=y, timeslice=ts)] += addition.reindex( - asset=result.asset.values - ) - - # Add production of environmental pollutants - env = is_pollutant(technologies.comm_usage) - result[{"commodity": env}] = emission( - result, technologies, timeslice_level=timeslice_level - ).transpose(*result.dims) - result[ - {"commodity": ~check_usage(technologies.comm_usage, CommodityUsage.PRODUCT)} - ] = 0 - - return result - - def emission( production: xr.DataArray, technologies: xr.Dataset, diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py new file mode 100644 index 000000000..40f14ebfb --- /dev/null +++ b/tests/test_dispatch.py @@ -0,0 +1,93 @@ +import numpy as np +import xarray as xr +from pytest import fixture + +from muse.commodities import is_enduse +from muse.timeslices import broadcast_timeslice, distribute_timeslice +from muse.utilities import broadcast_over_assets + + +@fixture +def technologies( + technologies: xr.Dataset, capacity: xr.DataArray, timeslice +) -> xr.Dataset: + return broadcast_over_assets(technologies, capacity) + + +@fixture +def production( + technologies: xr.Dataset, capacity: xr.DataArray, timeslice +) -> xr.DataArray: + return ( + broadcast_timeslice(capacity) + * distribute_timeslice(technologies.fixed_outputs) + * broadcast_timeslice(technologies.utilization_factor) + ) + + +def test_share_based_supply_single_region( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + timeslice, +): + from muse.dispatch import _share_based_supply_internal + + # Setup single region data + region = "USA" + technologies = technologies.where(technologies.region == region, drop=True) + capacity = capacity.where(capacity.region == region, drop=True) + production = production.where(production.region == region, drop=True) + + # Create random demand + demand = production.sum("asset") * np.random.rand(*production.sum("asset").shape) + assert "region" not in demand.dims + + # Test supply matches demand for end-use commodities + spl = _share_based_supply_internal(capacity, demand, technologies).sum("asset") + enduses = is_enduse(technologies.comm_usage) + assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 + + +def test_share_based_supply_multi_region( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + timeslice, +): + from muse.dispatch import _share_based_supply_internal + + # Create random demand + demand = production.groupby("region").sum("asset") + demand = demand * np.random.rand(*demand.shape) + assert "region" in demand.dims + + # Test supply matches demand for end-use commodities by region + spl = ( + _share_based_supply_internal(capacity, demand, technologies) + .groupby("region") + .sum("asset") + ) + enduses = is_enduse(technologies.comm_usage) + assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 + + +def test_share_based_supply_with_min_service( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + timeslice, +): + from muse.dispatch import _share_based_supply_internal + from muse.quantities import minimum_production + + technologies["minimum_service_factor"] = 0.3 + minprod = minimum_production(technologies, capacity) + + # Create random demand + demand = production.groupby("region").sum("asset") + demand = demand * np.random.rand(*demand.shape) + + # Test supply meets minimum production constraint + spl = _share_based_supply_internal(capacity, demand, technologies) + assert (spl >= minprod).all() diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 65c9fbbf9..4c57e4aee 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -10,7 +10,6 @@ maximum_production, minimum_production, production_amplitude, - supply, ) from muse.timeslices import broadcast_timeslice, distribute_timeslice from muse.utilities import broadcast_over_assets @@ -147,63 +146,6 @@ def test_min_production(technologies: xr.Dataset, capacity: xr.DataArray, timesl assert (production <= maximum_production(technologies, capacity)).all() -def test_supply_single_region( - technologies: xr.Dataset, - capacity: xr.DataArray, - production: xr.DataArray, - timeslice, -): - # Setup single region data - region = "USA" - technologies = technologies.where(technologies.region == region, drop=True) - capacity = capacity.where(capacity.region == region, drop=True) - production = production.where(production.region == region, drop=True) - - # Create random demand - demand = production.sum("asset") * np.random.rand(*production.sum("asset").shape) - assert "region" not in demand.dims - - # Test supply matches demand for end-use commodities - spl = supply(capacity, demand, technologies).sum("asset") - enduses = is_enduse(technologies.comm_usage) - assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 - - -def test_supply_multi_region( - technologies: xr.Dataset, - capacity: xr.DataArray, - production: xr.DataArray, - timeslice, -): - # Create random demand - demand = production.groupby("region").sum("asset") - demand = demand * np.random.rand(*demand.shape) - assert "region" in demand.dims - - # Test supply matches demand for end-use commodities by region - spl = supply(capacity, demand, technologies).groupby("region").sum("asset") - enduses = is_enduse(technologies.comm_usage) - assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 - - -def test_supply_with_min_service( - technologies: xr.Dataset, - capacity: xr.DataArray, - production: xr.DataArray, - timeslice, -): - technologies["minimum_service_factor"] = 0.3 - minprod = minimum_production(technologies, capacity) - - # Create random demand - demand = production.groupby("region").sum("asset") - demand = demand * np.random.rand(*demand.shape) - - # Test supply meets minimum production constraint - spl = supply(capacity, demand, technologies) - assert (spl >= minprod).all() - - def test_production_amplitude(production: xr.DataArray, technologies: xr.Dataset): techs = broadcast_over_assets(technologies, production) result = production_amplitude(production, techs) From 1fe7e5487cb38d73b30d58eb2c880512caba7d36 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 14:07:28 +0100 Subject: [PATCH 04/41] Remove internal helper functions --- src/muse/dispatch.py | 54 ++++++++++---------------------------- src/muse/outputs/mca.py | 12 ++++----- src/muse/sectors/sector.py | 3 ++- 3 files changed, 22 insertions(+), 47 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 9a5118cf8..8ca536aee 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -76,10 +76,11 @@ def factory(name) -> PRODUCTION_SIGNATURE: @register_production(name=("max", "maximum")) def maximum_production( - market: xr.Dataset, + demand: xr.DataArray, capacity: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None, + **kwargs, ) -> xr.DataArray: """Production when running at full capacity. @@ -93,43 +94,11 @@ def maximum_production( @register_production(name=("share", "shares")) def share_based_supply( - market: xr.Dataset, - capacity: xr.DataArray, - technologies: xr.Dataset, - timeslice_level: str | None = None, -) -> xr.DataArray: - """Service current demand equally from all assets. - - "Equally" means that equivalent technologies are used to the same percentage of - their respective capacity. - """ - return _share_based_supply_internal( - capacity, market.consumption, technologies, timeslice_level=timeslice_level - ) - - -@register_production(name=("merit", "merit_order")) -def merit_order_supply( - market: xr.Dataset, + demand: xr.DataArray, capacity: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None, -) -> xr.DataArray: - """Service current demand from the cheapest assets.""" - return _merit_order_supply_internal( - capacity, - market.consumption, - technologies, - prices=market.prices, - timeslice_level=timeslice_level, - ) - - -def _share_based_supply_internal( - capacity: xr.DataArray, - demand: xr.DataArray, - technologies: xr.Dataset | xr.DataArray, - timeslice_level: str | None = None, + **kwargs, ) -> xr.DataArray: """Production and emission for a given capacity servicing a given demand. @@ -145,12 +114,13 @@ def _share_based_supply_internal( residential heating systems, where each household meets its own demand). Arguments: - capacity: number/quantity of assets that can service the demand demand: amount of each end-use required. The supply of each process will not exceed its share of the demand. + capacity: number/quantity of assets that can service the demand technologies: factors bindings the capacity of an asset with its production of commodities and environmental pollutants. timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + **kwargs: any number of keyword arguments (not used in this method) Return: A data array where the commodity dimension only contains actual outputs (i.e. no @@ -213,13 +183,17 @@ def _share_based_supply_internal( return result -def _merit_order_supply_internal( - capacity: xr.DataArray, +@register_production(name=("merit", "merit_order")) +def merit_order_supply( demand: xr.DataArray, - technologies: xr.Dataset | xr.DataArray, - prices: xr.DataArray, + capacity: xr.DataArray, + technologies: xr.Dataset, timeslice_level: str | None = None, + *, + prices: xr.DataArray, + **kwargs, ) -> xr.DataArray: + """Service current demand from the cheapest assets.""" from muse.commodities import CommodityUsage, check_usage, is_pollutant from muse.costs import levelized_cost_of_energy from muse.quantities import ( diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index fe69fe696..14bb114e3 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -195,7 +195,7 @@ def sector_fuel_costs( """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel from muse.dispatch import ( - _share_based_supply_internal, + share_based_supply, ) # TODO: should not have to recalculate supply from muse.quantities import consumption @@ -216,9 +216,9 @@ def sector_fuel_costs( year=year, ).fillna(0.0) - production = _share_based_supply_internal( - capacity, + production = share_based_supply( agent_market.consumption, + capacity, technologies, ) @@ -301,7 +301,7 @@ def sector_emission_costs( """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant from muse.dispatch import ( - _share_based_supply_internal, + share_based_supply, ) # TODO: should not have to recalculate supply data_sector: list[xr.DataArray] = [] @@ -327,9 +327,9 @@ def sector_emission_costs( i = (np.where(envs))[0][0] red_envs = envs[i].commodity.values prices = a.filter_input(market.prices, year=year, commodity=red_envs) - production = _share_based_supply_internal( - capacity, + production = share_based_supply( agent_market.consumption, + capacity, technologies, ) diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 9b70d3cd7..fbfbc1f12 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -291,10 +291,11 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: # Calculate supply supply = self.supply_prod( - market=market, + demand=market.consumption, capacity=capacity, technologies=technodata, timeslice_level=self.timeslice_level, + prices=prices, ) # Calculate consumption From 2b43af8379857113d79999b17aad59b192fc3069 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 14:12:19 +0100 Subject: [PATCH 05/41] Update tests --- src/muse/dispatch.py | 4 ++-- tests/test_dispatch.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 8ca536aee..8c5fa9eee 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -15,13 +15,13 @@ @register_production def production( - market: xr.Dataset, capacity: xr.DataArray, technologies: xr.Dataset, **kwargs + demand: xr.DataArray, capacity: xr.DataArray, technologies: xr.Dataset, **kwargs ) -> xr.DataArray: pass Arguments: - market: Market, including demand and prices. + demand: The demand for each commodity. capacity: The capacity of each asset within a market. technologies: A dataset characterising the technologies of the same assets. **kwargs: Any number of keyword arguments diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 40f14ebfb..14966b23d 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -31,7 +31,7 @@ def test_share_based_supply_single_region( production: xr.DataArray, timeslice, ): - from muse.dispatch import _share_based_supply_internal + from muse.dispatch import share_based_supply # Setup single region data region = "USA" @@ -44,7 +44,7 @@ def test_share_based_supply_single_region( assert "region" not in demand.dims # Test supply matches demand for end-use commodities - spl = _share_based_supply_internal(capacity, demand, technologies).sum("asset") + spl = share_based_supply(demand, capacity, technologies).sum("asset") enduses = is_enduse(technologies.comm_usage) assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 @@ -55,7 +55,7 @@ def test_share_based_supply_multi_region( production: xr.DataArray, timeslice, ): - from muse.dispatch import _share_based_supply_internal + from muse.dispatch import share_based_supply # Create random demand demand = production.groupby("region").sum("asset") @@ -64,7 +64,7 @@ def test_share_based_supply_multi_region( # Test supply matches demand for end-use commodities by region spl = ( - _share_based_supply_internal(capacity, demand, technologies) + share_based_supply(demand, capacity, technologies) .groupby("region") .sum("asset") ) @@ -78,7 +78,7 @@ def test_share_based_supply_with_min_service( production: xr.DataArray, timeslice, ): - from muse.dispatch import _share_based_supply_internal + from muse.dispatch import share_based_supply from muse.quantities import minimum_production technologies["minimum_service_factor"] = 0.3 @@ -89,5 +89,5 @@ def test_share_based_supply_with_min_service( demand = demand * np.random.rand(*demand.shape) # Test supply meets minimum production constraint - spl = _share_based_supply_internal(capacity, demand, technologies) + spl = share_based_supply(demand, capacity, technologies) assert (spl >= minprod).all() From 6142139982c884239249764698b4d703a82579ee Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 15:04:12 +0100 Subject: [PATCH 06/41] Fix issue with prices data structure --- src/muse/dispatch.py | 1 - src/muse/sectors/sector.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 8c5fa9eee..7c921bf49 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -223,7 +223,6 @@ def merit_order_supply( if len(set(maxprod.region.values.flatten())) == 1: if "region" in demand.dims: demand = demand.sel(region=maxprod.region) - prices = prices.sel(region=maxprod.region) else: raise ValueError("merit_order_supply not yet supported in multi-region models") diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index fbfbc1f12..e35a66a29 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -286,8 +286,8 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: technologies, capacity, installed_as_year=True ) - # Select relevant investment year prices for each asset - prices = broadcast_over_assets(market.prices.isel(year=1), capacity) + # Select relevant prices for each asset + prices = broadcast_over_assets(market.prices, capacity, installed_as_year=False) # Calculate supply supply = self.supply_prod( @@ -315,7 +315,7 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: timeslice_level=self.timeslice_level, ) lcoe = levelized_cost_of_energy( - prices=prices, + prices=prices.isel(year=1), technologies=technodata, capacity=utilized_capacity, production=supply.isel(year=1), From 116727f7bfe2f639d283b02744febc2cb1ff8fcd Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 15:53:29 +0100 Subject: [PATCH 07/41] Add docstring and test Co-authored-by: Copilot --- src/muse/dispatch.py | 127 +++++++++++++++++++++++++++++++---------- tests/test_dispatch.py | 30 ++++++++++ 2 files changed, 128 insertions(+), 29 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 7c921bf49..e5695c215 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -193,7 +193,21 @@ def merit_order_supply( prices: xr.DataArray, **kwargs, ) -> xr.DataArray: - """Service current demand from the cheapest assets.""" + """Service demand by preferentially dispatching the cheapest assets. + + This method fully utilises the cheapest assets (up to their maximum production) + before dispatching more expensive assets, until demand is met, whilst also + respecting minimum production constraints. + + Each timeslice and year is treated independently, so the dispatch order can vary + across timeslices and years. For an example in a single timeslice/year/region, see + the docstring of :py:func:`merit_order_dispatch`. + + This is best suited to sectors where demand can be met by any of a number of assets, + and where there is a strong economic rationale for preferentially dispatching + cheaper assets. A good example is the electricity production sector, where + demand/supply are generally pooled across assets in a common grid. + """ from muse.commodities import CommodityUsage, check_usage, is_pollutant from muse.costs import levelized_cost_of_energy from muse.quantities import ( @@ -224,13 +238,16 @@ def merit_order_supply( if "region" in demand.dims: demand = demand.sel(region=maxprod.region) else: + # TODO: get this working with multi-region models - not a priority right now raise ValueError("merit_order_supply not yet supported in multi-region models") - # Set capital costs to zero so they're not included in the cost-minimisation + # Set capital costs and fixed costs to zero so they're not included in the + # cost-minimisation technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) + technologies = technologies.assign(fix_par=xr.zeros_like(technologies.fix_par)) - # All assets operate at at least their minimum production - result = minprod.copy() + # Initialise result with zeros + result = xr.zeros_like(maxprod) for y in maxprod.year.values: # Calculate timeslice-level costs for each asset in this year assuming full @@ -243,32 +260,14 @@ def merit_order_supply( consumption=maxcons.sel(year=y), ) - # Meet supply in each timeslice by utilising the cheapest assets first, up to - # their maximum production + # Calculate production for this year by dispatching assets in order of + # increasing cost until demand is met for ts in maxprod.timeslice.values: - # Remaining demand after minimum production (i.e. what we need to meet with - # the available headroom above minimum) - remaining = demand.sel(year=y, timeslice=ts) - minprod.sel( - year=y, timeslice=ts - ).sum("asset") - - # Rank assets by cost (cheapest first) - costs_ts = technology_costs.sel(timeslice=ts) - order = costs_ts.sortby(costs_ts).asset - - # Available extra production above minimum, sorted by cost - available = (maxprod - minprod).sel(year=y, timeslice=ts).sel(asset=order) - - # cumsum_before[i] = total available production of all assets cheaper than - # i - cumsum_before = available.cumsum("asset") - available - - # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets - # are fully utilised. Clipping to [0, available[i]] ensures we never - # produce negative amounts or exceed this asset's headroom above minprod. - addition = (remaining - cumsum_before).clip(min=0, max=available) - result.loc[dict(year=y, timeslice=ts)] += addition.reindex( - asset=result.asset.values + result.loc[dict(year=y, timeslice=ts)] = dispatch_by_merit_order( + demand=demand.sel(year=y, timeslice=ts), + minprod=minprod.sel(year=y, timeslice=ts), + maxprod=maxprod.sel(year=y, timeslice=ts), + technology_costs=technology_costs.sel(timeslice=ts), ) # Add production of environmental pollutants @@ -281,3 +280,73 @@ def merit_order_supply( ] = 0 return result + + +def dispatch_by_merit_order( + demand: xr.DataArray, + minprod: xr.DataArray, + maxprod: xr.DataArray, + technology_costs: xr.DataArray, +) -> xr.DataArray: + """Dispatch assets in order of increasing cost until demand is met. + + For example, we have the following three assets (ordered from cheapest to most + expensive): + - Asset A: minprod=10, maxprod=100, cost=5 + - Asset B: minprod=20, maxprod=50, cost=10 + - Asset C: minprod=0, maxprod=30, cost=15 + + If the total demand is 140 units, we would dispatch as follows: + - First we dispatch Assets A and B at their minimum production, which gives us 30 + units of supply, leaving 110 units of remaining demand. + - Next we dispatch Asset A up to its maximum, which gives us an additional 90 units + of supply, leaving 20 units of remaining demand. + - The remaining demand of 20 is less than the headroom of Asset B above its + minimum (i.e. 50 - 20 = 30), so we dispatch Asset B for an additional 20 units, + which meets the total demand of 140. + - Asset C is not dispatched at all since it's the most expensive and demand is + already met by cheaper assets. + + Arguments: + demand: DataArray of demand values, which should have a single 'commodity' + dimension + minprod: DataArray of minimum production values for the candidate assets, with + dimensions 'asset' and 'commodity' + maxprod: DataArray of maximum production values for the candidate assets, with + dimensions 'asset' and 'commodity' + technology_costs: DataArray of technology costs for the candidate assets, which + should have a single 'asset' dimension. This is the cost per unit of + production for each asset, which determines the order of dispatch (cheapest + first). + """ + assert set(demand.dims) == {"commodity"} + assert set(minprod.dims) == {"asset", "commodity"} + assert set(maxprod.dims) == {"asset", "commodity"} + assert set(technology_costs.dims) == {"asset"} + + # Start with minimum production + result = minprod.copy() + + # Calculate remaining demand after minimum production (i.e. what we need to meet + # with the available headroom above minimum) + remaining = demand - minprod.sum("asset") + + # Rank assets by cost (cheapest first) + order = technology_costs.sortby(technology_costs).asset + + # Available extra production above minimum, sorted by cost + available = (maxprod - minprod).sel(asset=order) + + # cumsum_before[i] = total available production of all assets cheaper than + # i + cumsum_before = available.cumsum("asset") - available + + # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets + # are fully utilised. Clipping to [0, available[i]] ensures we never + # produce negative amounts or exceed this asset's headroom above minprod. + addition = (remaining - cumsum_before).clip(min=0, max=available) + + # Final production is minimum production plus any additional production from these + # assets + result = minprod + addition + return result diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 14966b23d..1142b68a0 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -91,3 +91,33 @@ def test_share_based_supply_with_min_service( # Test supply meets minimum production constraint spl = share_based_supply(demand, capacity, technologies) assert (spl >= minprod).all() + + +def test_merit_order_dispatch(): + from muse.dispatch import dispatch_by_merit_order + + demand = xr.DataArray( + [140], dims=("commodity",), coords={"commodity": ["electricity"]} + ) + minprod = xr.DataArray( + [[10], [20], [0]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + maxprod = xr.DataArray( + [[100], [50], [30]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + technology_costs = xr.DataArray( + [5, 10, 15], dims=("asset",), coords={"asset": ["A", "B", "C"]} + ) + + result = dispatch_by_merit_order(demand, minprod, maxprod, technology_costs) + + expected = xr.DataArray( + [[100], [40], [0]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + xr.testing.assert_equal(result, expected) From 2a13a63851ea98a167a2f76682edb408f19348bb Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 16:43:02 +0100 Subject: [PATCH 08/41] Change default and update results files --- src/muse/data/example/default/settings.toml | 3 + .../example/default_timeslice/settings.toml | 3 + .../example/minimum_service/settings.toml | 1 + .../default/Results/MCACapacity.csv | 59 ++--- .../default/Results/MCAPrices.csv | 144 +++++------ .../default/Results/MCASupply.csv | 138 ++++------- .../default_adhoc/Results/MCACapacity.csv | 60 ++--- .../default_adhoc/Results/MCAPrices.csv | 132 +++++----- .../default_adhoc/Results/MCASupply.csv | 90 +++---- .../Results/MCACapacity.csv | 56 ++--- .../default_correlation/Results/MCAPrices.csv | 144 +++++------ .../default_correlation/Results/MCASupply.csv | 114 +++------ .../default_timeslice/Results/MCAPrices.csv | 144 +++++------ .../default_timeslice/Results/MCASupply.csv | 20 +- .../Results/Power_Supply.csv | 229 ++++++++---------- .../medium/Results/MCAPrices.csv | 108 ++++----- .../minimum_service/Results/MCAPrices.csv | 48 ++-- .../minimum_service/Results/MCASupply.csv | 36 +-- .../multiple_agents/Results/MCAPrices.csv | 108 ++++----- 19 files changed, 747 insertions(+), 890 deletions(-) diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index 2b0b18ed7..e9b85f741 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index 999bb1797..2f4408094 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' technodata_timeslices = '{path}/power/TechnodataTimeslices.csv' commodities_in = '{path}/power/CommIn.csv' @@ -61,6 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml index 90b0275b2..a0fb7af30 100644 --- a/src/muse/data/example/minimum_service/settings.toml +++ b/src/muse/data/example/minimum_service/settings.toml @@ -28,6 +28,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.industry] type = 'default' priority = 1 +dispatch_production = "merit-order" technodata = '{path}/industry/Technodata.csv' commodities_in = '{path}/industry/CommIn.csv' commodities_out = '{path}/industry/CommOut.csv' diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 550520759..53ca36863 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -3,56 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index d916135e5..e5580eeac 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,21.3025,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.3017,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,21.3025,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.3017,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,21.3025,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.3017,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,21.3025,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.3017,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.3025,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.3017,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,21.3025,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.3017,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.3268,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.1281,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.3268,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.1281,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.3268,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.1281,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.3268,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.1281,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.3268,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.1281,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.3268,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.1281,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,22.2411,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.4939,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,22.2411,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.4939,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,22.2411,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.4939,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,22.2411,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.4939,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.2411,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.4939,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,22.2411,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.4939,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,23.4166,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.9641,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,23.4166,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.9641,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,23.4166,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.9641,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,23.4166,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.9641,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,23.4166,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.9641,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,23.4166,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.9641,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,24.3309,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.3298,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,24.3309,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.3298,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,24.3309,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,12.3298,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,24.3309,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.3298,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,24.3309,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.3298,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,24.3309,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.3298,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default/Results/MCASupply.csv b/tests/example_outputs/default/Results/MCASupply.csv index 6be572a2c..101c2f4e0 100644 --- a/tests/example_outputs/default/Results/MCASupply.csv +++ b/tests/example_outputs/default/Results/MCASupply.csv @@ -17,147 +17,105 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.1433,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,63.4137,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.7149,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,95.1205,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.1433,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,63.4137,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.7149,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,95.1205,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.2866,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,126.8274,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 282a08bb2..53ca36863 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -3,45 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2030 -A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2035 -A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2035 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2040 -A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2040 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2045 -A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2045 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2050 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,11.3438,r1,2050,r1,power,windturbine,newcapa,2050 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 043aeb0a8..e5580eeac 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,18.6509,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.6247,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,18.6509,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.6247,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,18.6509,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.6247,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,18.6509,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.6247,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,18.6509,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.6247,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,18.6509,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.6247,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.4829,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.4829,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.4829,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.4829,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.4829,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.4829,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.7973,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.7973,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.7973,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.7973,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.7973,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.7973,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,9.7973,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.7973,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,9.7973,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.7973,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.7973,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.7973,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,9.7973,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.7973,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,9.7973,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.7973,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.7973,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.7973,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.7973,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.7973,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.7973,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.7973,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.7973,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.7973,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCASupply.csv b/tests/example_outputs/default_adhoc/Results/MCASupply.csv index 1c14d9546..101c2f4e0 100644 --- a/tests/example_outputs/default_adhoc/Results/MCASupply.csv +++ b/tests/example_outputs/default_adhoc/Results/MCASupply.csv @@ -17,66 +17,72 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1408,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,63.5640,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7112,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,95.3460,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.1408,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,63.5640,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7112,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,95.3460,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.2816,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,127.1279,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,61.5082,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,61.5082,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,123.0164,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,82.0109,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 diff --git a/tests/example_outputs/default_correlation/Results/MCACapacity.csv b/tests/example_outputs/default_correlation/Results/MCACapacity.csv index d89a7846c..b45afdea8 100644 --- a/tests/example_outputs/default_correlation/Results/MCACapacity.csv +++ b/tests/example_outputs/default_correlation/Results/MCACapacity.csv @@ -3,55 +3,43 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2030 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2035 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2035 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2035 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2035 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2040 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2040 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2040 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2040 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2040 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2045 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2045 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2045 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2045 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2045 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2045 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2050 A1,6.4684,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2050 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2050 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2050 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2050 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2050 A1,0.3159,r1,2050,r1,power,windturbine,newcapa,2050 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2050 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default_correlation/Results/MCAPrices.csv b/tests/example_outputs/default_correlation/Results/MCAPrices.csv index 5ad9b6d82..92e23b63d 100644 --- a/tests/example_outputs/default_correlation/Results/MCAPrices.csv +++ b/tests/example_outputs/default_correlation/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.1996,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2723,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3177,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1996,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2378,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3177,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1996,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2723,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.3177,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1996,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2378,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3177,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1996,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.2037,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3177,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1996,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2206,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3177,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,20.3898,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.0082,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.6016,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.8003,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.3898,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.0082,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.6016,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.8003,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,20.3898,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.0082,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.6016,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.8003,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.3898,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.0082,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.6016,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.8003,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,20.3898,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.0082,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.6016,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.8003,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,20.3898,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.0082,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.6016,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.8003,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.4272,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.9783,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.1695,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.8019,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.4272,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.8542,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.1695,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.8019,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.4272,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.9783,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.1695,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.8019,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.4272,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.8542,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.1695,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.8019,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.4272,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.6485,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.1695,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.8019,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.4272,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.7716,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.1695,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.8019,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,22.9589,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.3487,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.7822,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.9900,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,22.9589,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.6966,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.7822,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.3403,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,22.9589,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.3487,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.7822,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.9900,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,22.9589,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.6966,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.7822,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.3403,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.9589,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.8408,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.7822,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.6580,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,22.9589,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.3519,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.7822,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.5073,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,25.1134,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.5488,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.6440,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.1381,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,25.1134,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.5870,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.6440,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.2773,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,25.1134,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.5488,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.6440,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.1381,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,25.1134,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.5870,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.6440,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.2773,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,25.1134,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,22.9936,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.6440,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.7350,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,25.1134,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.0885,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.6440,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,10.3394,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,27.1971,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.7219,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.4775,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.2182,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,27.1971,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.4728,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.4775,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.2334,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,27.1971,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.7219,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.4775,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.2182,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,27.1971,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.4728,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.4775,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.2334,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,27.1971,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,23.1647,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.4775,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.7961,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,27.1971,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.8316,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.4775,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.2340,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_correlation/Results/MCASupply.csv b/tests/example_outputs/default_correlation/Results/MCASupply.csv index cf0693509..ea15193b0 100644 --- a/tests/example_outputs/default_correlation/Results/MCASupply.csv +++ b/tests/example_outputs/default_correlation/Results/MCASupply.csv @@ -17,147 +17,93 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1680,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,0.8751,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0817,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9325,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,48.5650,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.3188,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,60.3400,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,1.6301,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.4053,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,73.1896,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1680,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,0.8751,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,90.9349,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.0817,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,0.9325,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,48.5650,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.3188,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,60.3400,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,1.6301,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.4053,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,73.1896,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,2.6375,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,90.9349,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,3.2602,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8105,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,146.3791,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3383,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,1.7625,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,181.8698,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,2.1786,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8781,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,97.8141,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.2932,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.4829,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,121.5298,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1252,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7609,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,0.9690,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,26.7545,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.4418,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,0.7278,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,42.4490,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.1887,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.1468,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.4603,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,40.3201,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.2932,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.4829,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,63.9724,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1252,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7609,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,0.9690,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,26.7545,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.4418,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,0.7278,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,42.4490,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.1887,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.1468,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.4603,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,40.3201,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.8836,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,1.4556,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,63.9724,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.3774,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.2936,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,2.9206,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,80.6403,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.5905,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,0.9727,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,127.9448,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.2522,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.5326,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,1.9516,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,53.8858,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,85.4958,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.3985,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,0.9963,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,r1,0.6006,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,1.5015,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,r1,0.3985,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,0.9963,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,r1,0.6006,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,1.5015,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,r1,1.2012,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,3.0029,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r1,0.8027,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.0066,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.4094,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,1.0235,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,0.6170,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,1.5425,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.4094,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,1.0235,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,0.6170,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,1.5425,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,1.2340,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,3.0849,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.8246,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,2.0614,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,0.4164,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,1.0410,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,0.6276,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,1.5689,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,0.4164,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,1.0410,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,0.6276,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,1.5689,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,1.2551,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,3.1378,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,0.8387,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,2.0967,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,0.4234,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,1.0585,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,0.6381,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,1.5952,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,0.4234,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,1.0585,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,0.6381,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,1.5952,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,1.2762,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,3.1904,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,0.8528,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,2.1319,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,23.1166,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 fbd097082..a9a92b5e1 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,11.3165,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.6587,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.7351,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.3110,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,11.3165,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.7240,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.7351,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.6795,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,11.3165,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,17.6587,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.7351,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.3110,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,11.3165,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.7240,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.7351,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.6795,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.3165,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,13.7892,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.7351,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.0480,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,11.3165,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,14.7566,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.7351,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.3638,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,5.1246,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.8054,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.2909,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.8540,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.8054,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.7197,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,5.1246,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.8054,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.2909,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.8540,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.8054,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.7197,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.5834,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.8054,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.1484,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.7187,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.8054,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.9340,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,4.4966,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,4.6473,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,4.6188,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.3390,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,4.4966,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,4.6473,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,4.6188,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.3390,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.2436,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.0308,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.7094,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.6849,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,4.3255,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,4.3961,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,5.3842,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,4.4449,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,4.3255,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,4.3961,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,5.3842,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,4.4449,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,10.8382,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,7.0949,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.3405,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.6812,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,4.1865,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,4.3276,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,5.5136,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,4.7511,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,4.1865,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,4.3276,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,5.5136,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,4.7511,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,11.2657,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,6.9327,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,6.6442,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.5336,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.4748,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,4.2720,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.9496,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,4.8028,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.4748,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,4.2720,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.9496,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,4.8028,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,11.9409,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.1037,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,6.1889,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.2551,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCASupply.csv b/tests/example_outputs/default_timeslice/Results/MCASupply.csv index c707c65bd..666ecbbe4 100644 --- a/tests/example_outputs/default_timeslice/Results/MCASupply.csv +++ b/tests/example_outputs/default_timeslice/Results/MCASupply.csv @@ -18,29 +18,29 @@ gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1501,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,64.0732,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7251,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,96.1099,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.1501,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,64.0732,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7251,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,96.1099,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4502,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,192.2197,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.3001,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.3929,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,128.1465,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,133.2393,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index bf3eb5d9a..29feab453 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,133 +1,96 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 -0,electricity,all-week,night,2020,all-year,r1,0.0556,gasCCGT,0,MUS$2010/PJ,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.0833,gasCCGT,1,MUS$2010/PJ,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.0556,gasCCGT,2,MUS$2010/PJ,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0833,gasCCGT,3,MUS$2010/PJ,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,MUS$2010/PJ,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.1111,gasCCGT,5,MUS$2010/PJ,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2030 -2,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2030 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2035 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2035 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2035 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2035 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2035 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2035 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2040 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2040 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2040 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2040 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2040 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2040 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2040 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2040 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2040 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2045 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2045 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2045 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2045 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2045 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2045 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2045 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2050 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -5,electricity,all-week,night,2050,all-year,r1,0.2465,windturbine,0,MUS$2010/PJ,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2050 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -5,electricity,all-week,morning,2050,all-year,r1,0.3698,windturbine,1,MUS$2010/PJ,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2050 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -5,electricity,all-week,afternoon,2050,all-year,r1,0.2465,windturbine,2,MUS$2010/PJ,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2050 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -5,electricity,all-week,early-peak,2050,all-year,r1,0.3698,windturbine,3,MUS$2010/PJ,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,MUS$2010/PJ,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2050 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -5,electricity,all-week,evening,2050,all-year,r1,0.4931,windturbine,5,MUS$2010/PJ,2050 +asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,r1,0.1708,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2030 +2,electricity,all-week,night,2030,all-year,r1,0.0736,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,r1,0.2802,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2030 +2,electricity,all-week,afternoon,2030,all-year,r1,0.0736,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,r1,0.2802,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,r1,0.4868,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,r1,0.4604,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,r1,0.8604,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,r1,0.4604,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,r1,0.8604,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,r1,0.5937,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,r1,0.5937,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,r1,0.7271,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,r1,0.7271,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,r1,0.9000,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,r1,0.3000,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,r1,0.9000,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,r1,0.9000,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,r1,0.3000,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,r1,0.9000,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,r1,0.3396,windturbine,5,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 0b4eb059c..7604e2d26 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -35,37 +35,37 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.3773,r1,0,MUS$2010/GWh,2025 +electricity,all-week,night,all-year,29.1361,r1,0,MUS$2010/GWh,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.8475,r1,0,MUS$2010/PJ,2025 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,28.3773,r1,1,MUS$2010/GWh,2025 +electricity,all-week,morning,all-year,29.1361,r1,1,MUS$2010/GWh,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,11.8475,r1,1,MUS$2010/PJ,2025 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,28.3773,r1,2,MUS$2010/GWh,2025 +electricity,all-week,afternoon,all-year,29.1361,r1,2,MUS$2010/GWh,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,11.8475,r1,2,MUS$2010/PJ,2025 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,28.3773,r1,3,MUS$2010/GWh,2025 +electricity,all-week,early-peak,all-year,29.1361,r1,3,MUS$2010/GWh,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,11.8475,r1,3,MUS$2010/PJ,2025 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,28.3773,r1,4,MUS$2010/GWh,2025 +electricity,all-week,late-peak,all-year,32.0920,r1,4,MUS$2010/GWh,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,11.8475,r1,4,MUS$2010/PJ,2025 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,28.3773,r1,5,MUS$2010/GWh,2025 +electricity,all-week,evening,all-year,29.1361,r1,5,MUS$2010/GWh,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,11.8475,r1,5,MUS$2010/PJ,2025 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2025 @@ -107,147 +107,147 @@ heat,all-week,evening,all-year,13.5005,r1,5,MUS$2010/PJ,2030 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/GWh,2035 +electricity,all-week,night,all-year,10.6027,r1,0,MUS$2010/GWh,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.1666,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,14.1488,r1,0,MUS$2010/PJ,2035 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/GWh,2035 +electricity,all-week,morning,all-year,15.1712,r1,1,MUS$2010/GWh,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,15.1666,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.7775,r1,1,MUS$2010/PJ,2035 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/GWh,2035 +electricity,all-week,afternoon,all-year,10.6027,r1,2,MUS$2010/GWh,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.1666,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,14.1488,r1,2,MUS$2010/PJ,2035 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/GWh,2035 +electricity,all-week,early-peak,all-year,15.1712,r1,3,MUS$2010/GWh,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,15.1666,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.7775,r1,3,MUS$2010/PJ,2035 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/GWh,2035 +electricity,all-week,late-peak,all-year,24.5269,r1,4,MUS$2010/GWh,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,15.1667,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,16.0648,r1,4,MUS$2010/PJ,2035 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/GWh,2035 +electricity,all-week,evening,all-year,19.8491,r1,5,MUS$2010/GWh,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,15.1667,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,15.4211,r1,5,MUS$2010/PJ,2035 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/GWh,2040 +electricity,all-week,night,all-year,10.5413,r1,0,MUS$2010/GWh,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.9746,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.7858,r1,0,MUS$2010/PJ,2040 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/GWh,2040 +electricity,all-week,morning,all-year,15.1917,r1,1,MUS$2010/GWh,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.9746,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.1505,r1,1,MUS$2010/PJ,2040 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/GWh,2040 +electricity,all-week,afternoon,all-year,10.5413,r1,2,MUS$2010/GWh,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.9746,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.7858,r1,2,MUS$2010/PJ,2040 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/GWh,2040 +electricity,all-week,early-peak,all-year,15.1917,r1,3,MUS$2010/GWh,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.9746,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.1505,r1,3,MUS$2010/PJ,2040 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/GWh,2040 +electricity,all-week,late-peak,all-year,24.5371,r1,4,MUS$2010/GWh,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.9746,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,14.8931,r1,4,MUS$2010/PJ,2040 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/GWh,2040 +electricity,all-week,evening,all-year,19.8644,r1,5,MUS$2010/GWh,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.9746,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.5218,r1,5,MUS$2010/PJ,2040 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/GWh,2045 +electricity,all-week,night,all-year,11.3163,r1,0,MUS$2010/GWh,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.4415,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.0239,r1,0,MUS$2010/PJ,2045 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/GWh,2045 +electricity,all-week,morning,all-year,13.9219,r1,1,MUS$2010/GWh,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.4415,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.9664,r1,1,MUS$2010/PJ,2045 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/GWh,2045 +electricity,all-week,afternoon,all-year,11.3163,r1,2,MUS$2010/GWh,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.4415,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.0239,r1,2,MUS$2010/PJ,2045 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/GWh,2045 +electricity,all-week,early-peak,all-year,13.9219,r1,3,MUS$2010/GWh,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.4415,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.9664,r1,3,MUS$2010/PJ,2045 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/GWh,2045 +electricity,all-week,late-peak,all-year,28.3834,r1,4,MUS$2010/GWh,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.4415,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,15.1975,r1,4,MUS$2010/PJ,2045 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/GWh,2045 +electricity,all-week,evening,all-year,15.2246,r1,5,MUS$2010/GWh,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.4415,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,10.4376,r1,5,MUS$2010/PJ,2045 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/GWh,2050 +electricity,all-week,night,all-year,11.3418,r1,0,MUS$2010/GWh,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.7973,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.1239,r1,0,MUS$2010/PJ,2050 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/GWh,2050 +electricity,all-week,morning,all-year,12.3280,r1,1,MUS$2010/GWh,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.7973,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.1662,r1,1,MUS$2010/PJ,2050 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/GWh,2050 +electricity,all-week,afternoon,all-year,11.3418,r1,2,MUS$2010/GWh,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.7973,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.1239,r1,2,MUS$2010/PJ,2050 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/GWh,2050 +electricity,all-week,early-peak,all-year,12.3280,r1,3,MUS$2010/GWh,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.7973,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.1662,r1,3,MUS$2010/PJ,2050 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/GWh,2050 +electricity,all-week,late-peak,all-year,28.8546,r1,4,MUS$2010/GWh,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.7973,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.9508,r1,4,MUS$2010/PJ,2050 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/GWh,2050 +electricity,all-week,evening,all-year,16.8832,r1,5,MUS$2010/GWh,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.7973,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.6873,r1,5,MUS$2010/PJ,2050 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 5df6205d7..6f8eb92d2 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -29,7 +29,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 fuel1,all-week,all-day,winter,1.0877,r1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.5169,r1,0,MUS$2010/PJ,2015 fuel3,all-week,all-day,winter,0.0617,r1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,392.9559,r1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,391.6106,r1,0,MUS$2010/Mt,2015 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 @@ -38,7 +38,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 fuel1,all-week,all-day,summer,1.0877,r1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.5169,r1,1,MUS$2010/PJ,2015 fuel3,all-week,all-day,summer,0.0617,r1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,392.9559,r1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,393.1583,r1,1,MUS$2010/Mt,2015 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 @@ -47,7 +47,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 fuel1,all-week,all-day,spring-autumn,1.0877,r1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.5169,r1,2,MUS$2010/PJ,2015 fuel3,all-week,all-day,spring-autumn,0.0617,r1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,392.9559,r1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,391.6106,r1,2,MUS$2010/Mt,2015 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 @@ -56,7 +56,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 fuel1,all-week,all-day,winter,1.1754,r1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.4826,r1,0,MUS$2010/PJ,2020 fuel3,all-week,all-day,winter,0.0702,r1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,415.4326,r1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,414.6444,r1,0,MUS$2010/Mt,2020 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 @@ -65,7 +65,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 fuel1,all-week,all-day,summer,1.1754,r1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.4826,r1,1,MUS$2010/PJ,2020 fuel3,all-week,all-day,summer,0.0702,r1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,415.4326,r1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,415.6344,r1,1,MUS$2010/Mt,2020 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 @@ -74,7 +74,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 fuel1,all-week,all-day,spring-autumn,1.1754,r1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.4826,r1,2,MUS$2010/PJ,2020 fuel3,all-week,all-day,spring-autumn,0.0702,r1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,415.4326,r1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,414.6444,r1,2,MUS$2010/Mt,2020 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 @@ -83,7 +83,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 fuel1,all-week,all-day,winter,1.1667,r1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.7108,r1,0,MUS$2010/PJ,2025 fuel3,all-week,all-day,winter,0.0828,r1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,469.8328,r1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,468.9620,r1,0,MUS$2010/Mt,2025 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 @@ -92,7 +92,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 fuel1,all-week,all-day,summer,1.1667,r1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.7108,r1,1,MUS$2010/PJ,2025 fuel3,all-week,all-day,summer,0.0828,r1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,469.8328,r1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,470.0343,r1,1,MUS$2010/Mt,2025 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 @@ -101,7 +101,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 fuel1,all-week,all-day,spring-autumn,1.1667,r1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.7108,r1,2,MUS$2010/PJ,2025 fuel3,all-week,all-day,spring-autumn,0.0828,r1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,469.8328,r1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,468.9620,r1,2,MUS$2010/Mt,2025 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 @@ -110,7 +110,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 fuel1,all-week,all-day,winter,1.1579,r1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.9390,r1,0,MUS$2010/PJ,2030 fuel3,all-week,all-day,winter,0.0954,r1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,523.5661,r1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,522.5924,r1,0,MUS$2010/Mt,2030 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 @@ -119,7 +119,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 fuel1,all-week,all-day,summer,1.1579,r1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.9390,r1,1,MUS$2010/PJ,2030 fuel3,all-week,all-day,summer,0.0954,r1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,523.5661,r1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,523.7673,r1,1,MUS$2010/Mt,2030 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 @@ -128,7 +128,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 fuel1,all-week,all-day,spring-autumn,1.1579,r1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.9390,r1,2,MUS$2010/PJ,2030 fuel3,all-week,all-day,spring-autumn,0.0954,r1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,523.5661,r1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,522.5924,r1,2,MUS$2010/Mt,2030 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 @@ -137,7 +137,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 fuel1,all-week,all-day,winter,1.1491,r1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.8155,r1,0,MUS$2010/PJ,2035 fuel3,all-week,all-day,winter,0.0907,r1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,492.2650,r1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,490.5216,r1,0,MUS$2010/Mt,2035 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 @@ -146,7 +146,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 fuel1,all-week,all-day,summer,1.1491,r1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.8155,r1,1,MUS$2010/PJ,2035 fuel3,all-week,all-day,summer,0.0907,r1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,492.2650,r1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,492.3409,r1,1,MUS$2010/Mt,2035 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 @@ -155,7 +155,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 fuel1,all-week,all-day,spring-autumn,1.1491,r1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.8155,r1,2,MUS$2010/PJ,2035 fuel3,all-week,all-day,spring-autumn,0.0907,r1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,492.2650,r1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,490.5216,r1,2,MUS$2010/Mt,2035 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 @@ -164,7 +164,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2040 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,460.4173,r1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,460.5384,r1,0,MUS$2010/Mt,2040 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 @@ -173,7 +173,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2040 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,460.4173,r1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,460.4305,r1,1,MUS$2010/Mt,2040 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 @@ -182,7 +182,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2040 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,460.4173,r1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,460.5384,r1,2,MUS$2010/Mt,2040 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 @@ -191,7 +191,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2045 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,458.2166,r1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,458.3355,r1,0,MUS$2010/Mt,2045 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 @@ -200,7 +200,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2045 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,458.2166,r1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,458.2289,r1,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 @@ -209,7 +209,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2045 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,458.2166,r1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,458.3355,r1,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 @@ -218,7 +218,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2050 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,455.9180,r1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,456.0445,r1,0,MUS$2010/Mt,2050 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 @@ -227,7 +227,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2050 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,455.9494,r1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,456.0036,r1,1,MUS$2010/Mt,2050 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 @@ -236,7 +236,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2050 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,455.9180,r1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,456.0445,r1,2,MUS$2010/Mt,2050 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index 771f439a3..1adba9f47 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -6,50 +6,50 @@ CO2f,all-week,all-day,summer,r1,53628.5650,1,MUS$2010/kt,2010 ammonia,all-week,all-day,spring-autumn,r1,14.7333,2,MUS$2010/Mt,2010 CO2f,all-week,all-day,spring-autumn,r1,53628.5650,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,r1,14.9200,0,MUS$2010/Mt,2015 -CO2f,all-week,all-day,winter,r1,55092.4480,0,MUS$2010/kt,2015 +CO2f,all-week,all-day,winter,r1,55365.8413,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,r1,15.3722,1,MUS$2010/Mt,2015 CO2f,all-week,all-day,summer,r1,56761.9161,1,MUS$2010/kt,2015 ammonia,all-week,all-day,spring-autumn,r1,14.9200,2,MUS$2010/Mt,2015 -CO2f,all-week,all-day,spring-autumn,r1,55092.4480,2,MUS$2010/kt,2015 +CO2f,all-week,all-day,spring-autumn,r1,55365.8413,2,MUS$2010/kt,2015 ammonia,all-week,all-day,winter,r1,14.9200,0,MUS$2010/Mt,2020 -CO2f,all-week,all-day,winter,r1,56197.8147,0,MUS$2010/kt,2020 +CO2f,all-week,all-day,winter,r1,56504.7040,0,MUS$2010/kt,2020 ammonia,all-week,all-day,summer,r1,15.3722,1,MUS$2010/Mt,2020 CO2f,all-week,all-day,summer,r1,57900.7788,1,MUS$2010/kt,2020 ammonia,all-week,all-day,spring-autumn,r1,14.9200,2,MUS$2010/Mt,2020 -CO2f,all-week,all-day,spring-autumn,r1,56197.8147,2,MUS$2010/kt,2020 +CO2f,all-week,all-day,spring-autumn,r1,56504.7040,2,MUS$2010/kt,2020 ammonia,all-week,all-day,winter,r1,14.9309,0,MUS$2010/Mt,2025 -CO2f,all-week,all-day,winter,r1,57270.8806,0,MUS$2010/kt,2025 +CO2f,all-week,all-day,winter,r1,57609.2679,0,MUS$2010/kt,2025 ammonia,all-week,all-day,summer,r1,15.3834,1,MUS$2010/Mt,2025 CO2f,all-week,all-day,summer,r1,59006.3618,1,MUS$2010/kt,2025 ammonia,all-week,all-day,spring-autumn,r1,14.9309,2,MUS$2010/Mt,2025 -CO2f,all-week,all-day,spring-autumn,r1,57270.8806,2,MUS$2010/kt,2025 +CO2f,all-week,all-day,spring-autumn,r1,57609.2679,2,MUS$2010/kt,2025 ammonia,all-week,all-day,winter,r1,14.9418,0,MUS$2010/Mt,2030 -CO2f,all-week,all-day,winter,r1,58266.9459,0,MUS$2010/kt,2030 +CO2f,all-week,all-day,winter,r1,58634.4978,0,MUS$2010/kt,2030 ammonia,all-week,all-day,summer,r1,15.3946,1,MUS$2010/Mt,2030 CO2f,all-week,all-day,summer,r1,60032.6110,1,MUS$2010/kt,2030 ammonia,all-week,all-day,spring-autumn,r1,14.9418,2,MUS$2010/Mt,2030 -CO2f,all-week,all-day,spring-autumn,r1,58266.9459,2,MUS$2010/kt,2030 +CO2f,all-week,all-day,spring-autumn,r1,58634.4978,2,MUS$2010/kt,2030 ammonia,all-week,all-day,winter,r1,14.7240,0,MUS$2010/Mt,2035 -CO2f,all-week,all-day,winter,r1,58588.2651,0,MUS$2010/kt,2035 +CO2f,all-week,all-day,winter,r1,58975.2249,0,MUS$2010/kt,2035 ammonia,all-week,all-day,summer,r1,15.1702,1,MUS$2010/Mt,2035 CO2f,all-week,all-day,summer,r1,60363.6671,1,MUS$2010/kt,2035 ammonia,all-week,all-day,spring-autumn,r1,14.7240,2,MUS$2010/Mt,2035 -CO2f,all-week,all-day,spring-autumn,r1,58588.2651,2,MUS$2010/kt,2035 +CO2f,all-week,all-day,spring-autumn,r1,58975.2249,2,MUS$2010/kt,2035 ammonia,all-week,all-day,winter,r1,14.5061,0,MUS$2010/Mt,2040 -CO2f,all-week,all-day,winter,r1,58214.4584,0,MUS$2010/kt,2040 +CO2f,all-week,all-day,winter,r1,58231.1626,0,MUS$2010/kt,2040 ammonia,all-week,all-day,summer,r1,14.9457,1,MUS$2010/Mt,2040 CO2f,all-week,all-day,summer,r1,59978.5329,1,MUS$2010/kt,2040 ammonia,all-week,all-day,spring-autumn,r1,14.5061,2,MUS$2010/Mt,2040 -CO2f,all-week,all-day,spring-autumn,r1,58214.4584,2,MUS$2010/kt,2040 +CO2f,all-week,all-day,spring-autumn,r1,58231.1626,2,MUS$2010/kt,2040 ammonia,all-week,all-day,winter,r1,14.0973,0,MUS$2010/Mt,2045 -CO2f,all-week,all-day,winter,r1,56294.5926,0,MUS$2010/kt,2045 +CO2f,all-week,all-day,winter,r1,56310.4886,0,MUS$2010/kt,2045 ammonia,all-week,all-day,summer,r1,14.5245,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,r1,58000.4894,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,r1,14.0973,2,MUS$2010/Mt,2045 -CO2f,all-week,all-day,spring-autumn,r1,56294.5926,2,MUS$2010/kt,2045 -ammonia,all-week,all-day,winter,r1,13.7487,0,MUS$2010/Mt,2050 -CO2f,all-week,all-day,winter,r1,54623.1637,0,MUS$2010/kt,2050 +CO2f,all-week,all-day,spring-autumn,r1,56310.4886,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,r1,13.6885,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,r1,54395.2335,0,MUS$2010/kt,2050 ammonia,all-week,all-day,summer,r1,14.1033,1,MUS$2010/Mt,2050 CO2f,all-week,all-day,summer,r1,56035.9915,1,MUS$2010/kt,2050 -ammonia,all-week,all-day,spring-autumn,r1,13.7487,2,MUS$2010/Mt,2050 -CO2f,all-week,all-day,spring-autumn,r1,54623.1637,2,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,r1,13.6885,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,r1,54395.2335,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 04bd3a0f7..6586f2e60 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -29,32 +29,32 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.3773,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.1361,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,28.3773,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,29.1361,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,28.3773,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,29.1361,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,28.3773,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,29.1361,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,28.3773,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,32.0920,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,28.3773,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,29.1361,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 @@ -89,123 +89,123 @@ gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,13.8628,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.6027,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.5693,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.0604,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.1712,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,16.5693,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,16.3747,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.6027,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.5693,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.0604,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.1712,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,16.5693,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,16.3747,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.5269,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,16.5693,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,17.0183,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.8491,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,16.5693,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,16.6965,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.5413,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,17.3472,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.2528,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,15.1917,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,17.3472,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.9351,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.5413,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,17.3472,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.2528,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,15.1917,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,17.3472,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.9351,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.5371,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.3472,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,18.3064,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.8644,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,17.3472,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,17.6208,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.5413,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,13.2552,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,10.8724,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,15.1917,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,13.2552,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.3581,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.5413,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,13.2552,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,10.8724,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,15.1917,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,13.2552,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.3581,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.5371,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,13.2552,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,15.3438,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.8644,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,13.2552,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.8509,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.8454,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,11.6110,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.9806,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.6621,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.6110,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.3838,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.8454,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,11.6110,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.9806,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.6621,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.6110,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.3838,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,27.0600,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,11.6110,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.9420,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.5705,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,11.6110,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.0855,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 From a2cf08117f9baadf8cc9c5a08266c9930b424444 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 16:59:22 +0100 Subject: [PATCH 09/41] Update tutorial models --- .../Results/MCACapacity.csv | 144 +++++----- .../1-single-objective/Results/MCAPrices.csv | 144 +++++----- .../1-single-objective/Results/MCASupply.csv | 174 ++++++------ .../1-single-objective/settings.toml | 3 + .../Results/MCACapacity.csv | 158 +++++------ .../Results/MCAPrices.csv | 144 +++++----- .../Results/MCASupply.csv | 198 +++++++------- .../2-multiple-objective/settings.toml | 3 + .../1-correlation/Results/MCACapacity.csv | 56 ++-- .../1-correlation/Results/MCAPrices.csv | 144 +++++----- .../1-correlation/Results/MCASupply.csv | 114 +++----- .../1-correlation/settings.toml | 3 + .../1-introduction/Results/MCACapacity.csv | 60 ++--- .../1-introduction/Results/MCAPrices.csv | 132 ++++----- .../1-introduction/Results/MCASupply.csv | 90 ++++--- .../1-introduction/settings.toml | 3 + .../2-scenario/Results/MCACapacity.csv | 54 ++-- .../2-scenario/Results/MCAPrices.csv | 144 +++++----- .../2-scenario/Results/MCASupply.csv | 138 ++++------ .../2-scenario/settings.toml | 3 + .../add-region/1-new-region/settings.toml | 3 + .../Results/MCACapacity.csv | 79 +++--- .../Results/MCAPrices.csv | 216 +++++++-------- .../Results/MCASupply.csv | 174 ++++++------ .../1-residential-subsectors/settings.toml | 3 + .../2-agents/Results/MCACapacity.csv | 70 ++--- .../2-agents/Results/MCAPrices.csv | 144 +++++----- .../2-agents/Results/MCASupply.csv | 174 ++++++------ .../2-agents/settings.toml | 3 + .../Results/MCACapacity.csv | 79 +++--- .../1-exogenous-demand/Results/MCAPrices.csv | 216 +++++++-------- .../1-exogenous-demand/Results/MCASupply.csv | 174 ++++++------ .../1-exogenous-demand/settings.toml | 3 + .../1-carbon-budget/Results/MCACapacity.csv | 4 +- .../1-carbon-budget/Results/MCAPrices.csv | 84 +++--- .../1-carbon-budget/Results/MCASupply.csv | 36 +-- .../1-carbon-budget/settings.toml | 3 + .../1-min-constraint/Results/MCAPrices.csv | 144 +++++----- .../1-min-constraint/Results/MCASupply.csv | 20 +- .../1-min-constraint/Results/Power_Supply.csv | 253 ++++++++---------- .../1-min-constraint/settings.toml | 3 + .../2-max-constraint/Results/MCAPrices.csv | 144 +++++----- .../2-max-constraint/Results/MCASupply.csv | 22 +- .../2-max-constraint/Results/Power_Supply.csv | 244 +++++++---------- .../2-max-constraint/settings.toml | 3 + .../Results/MCACapacity.csv | 59 ++-- .../1-modify-timeslices/Results/MCAPrices.csv | 192 ++++++------- .../1-modify-timeslices/Results/MCASupply.csv | 184 +++++-------- .../1-modify-timeslices/settings.toml | 3 + .../Results/MCAPrices.csv | 160 +++++------ .../Results/MCASupply.csv | 112 ++++---- .../2-modify-time-framework/settings.toml | 3 + 52 files changed, 2287 insertions(+), 2633 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 e562e24d9..aa9c45005 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,122 +6,98 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2040 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 +A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2040 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 +A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2040 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2040 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2045 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2045 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 +A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2045 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 +A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2045 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2045 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2045 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2050 A2,11.5000,r1,2050,r1,residential,gasboiler,newcapa,2050 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 +A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2050 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,1.5000,r1,2050,r1,power,windturbine,newcapa,2050 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 +A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2050 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A2,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 +A2,1.5000,r1,2050,r1,power,windturbine,newcapa,2050 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2050,r1,gas,gassupply1,newcapa,2050 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A2,1.9333,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 c935d740f..96acdc5a2 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.6283,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.7496,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.6283,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.7496,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.6283,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.7496,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.6283,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.7496,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.6283,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.7496,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.6283,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,18.5111,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.9201,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.6695,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.5111,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.9201,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.6695,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,18.5111,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.9201,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.6695,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.5111,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.9201,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.6695,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,18.5111,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.9201,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.6695,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,18.5111,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.9201,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.6695,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,18.5149,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.9896,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.5760,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,18.5149,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,13.9896,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.1573,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,18.5149,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.9896,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.5760,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,18.5149,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,13.9896,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.1573,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,18.5149,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,13.9896,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.7385,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.5149,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.9896,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.4479,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,18.6565,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.8906,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,14.8586,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,18.6565,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,15.8906,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.1348,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,18.6565,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.8906,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,14.8586,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,18.6565,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,15.8906,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.1348,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,18.6565,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,15.8906,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.3085,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,18.6565,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,15.8906,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.2730,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,18.8385,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.5540,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,17.3271,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,18.8385,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,18.5540,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,17.4899,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,18.8385,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.5540,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,17.3271,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,18.8385,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,18.5540,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,17.4899,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,18.8385,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.5540,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,20.5320,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.8385,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,18.5540,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,17.5713,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,18.9800,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,21.2092,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,19.8390,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.9800,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.2092,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,19.9426,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,18.9800,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,21.2092,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,19.8390,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.9800,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.2092,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,19.9426,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,18.9800,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,21.2092,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.1626,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,18.9800,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.2092,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,20.5690,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv index c3fd1230a..4dca91a89 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv @@ -17,147 +17,141 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.4142,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,78.7893,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.1213,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,118.1840,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.4142,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,78.7893,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.1213,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,118.1840,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.2425,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,236.3679,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.8284,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,157.5786,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.2066,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.3658,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.6886,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,76.1625,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.3099,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.0487,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,94.2002,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.5330,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,114.2437,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.2066,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.3658,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,141.3004,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.6886,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,76.1625,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.3099,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.0487,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,94.2002,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.5330,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,114.2437,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.6198,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.0974,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,141.3004,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,5.0659,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,228.4874,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.4132,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.7316,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,282.6007,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.1687,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,3.3773,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,152.3249,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.4000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.1916,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,188.4005,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.3622,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.2698,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,66.4447,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.6000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.7874,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,70.8327,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.5432,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.9046,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,99.6671,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.4000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.1916,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,106.2491,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.3622,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.2698,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,66.4447,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.6000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.7874,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,70.8327,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.5432,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.9046,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,99.6671,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.2000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.5748,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,106.2491,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,1.0865,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,3.8093,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,199.3342,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,0.8000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.3832,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,212.4982,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,0.7243,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,2.5395,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,132.8895,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,141.6655,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.4667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.3849,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,1.3533,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,77.2297,0,MUS$2010/kt,2040 +CO2f,all-week,night,all-year,r1,75.4950,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,0.7000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,2.0774,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,2.0300,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,115.8446,1,MUS$2010/kt,2040 +CO2f,all-week,morning,all-year,r1,113.2425,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.4667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.3849,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,1.3533,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,77.2297,2,MUS$2010/kt,2040 +CO2f,all-week,afternoon,all-year,r1,75.4950,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,0.7000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,2.0774,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,2.0300,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,115.8446,3,MUS$2010/kt,2040 +CO2f,all-week,early-peak,all-year,r1,113.2425,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,1.4000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,4.1548,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,4.0600,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,231.6892,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,226.4850,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.9333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,2.7699,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,2.7067,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,154.4595,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,150.9900,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,0.5333,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,1.5783,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,88.0147,0,MUS$2010/kt,2045 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,0.8000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,2.3674,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,132.0221,1,MUS$2010/kt,2045 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,0.5333,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,1.5783,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,88.0147,2,MUS$2010/kt,2045 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,0.8000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,2.3674,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,132.0221,3,MUS$2010/kt,2045 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,1.6000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,4.7348,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,264.0442,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,1.0667,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,3.1565,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,176.0295,5,MUS$2010/kt,2045 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,0.6000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,1.7716,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,1.7400,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,98.7997,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,r1,97.0650,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,0.9000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,2.6574,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,2.6100,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,148.1996,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,r1,145.5975,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,0.6000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,1.7716,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,1.7400,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,98.7997,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,r1,97.0650,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,0.9000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,2.6574,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,2.6100,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,148.1996,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,r1,145.5975,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,1.8000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,5.3148,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,5.2200,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,296.3992,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,291.1950,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,1.2000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,3.5432,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,3.4800,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,197.5995,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r1,194.1300,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/settings.toml b/docs/tutorial-code/add-agent/1-single-objective/settings.toml index 2b0b18ed7..e9b85f741 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/add-agent/1-single-objective/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 68a8c1730..6d31c4722 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,118 +6,88 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 -A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2040 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 +A2,4.7031,r1,2040,r1,residential,gasboiler,newcapa,2040 +A2,3.7969,r1,2040,r1,residential,heatpump,newcapa,2040 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 +A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2040 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 +A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2040 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 -A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2045 -A2,11.7031,r1,2045,r1,residential,gasboiler,newcapa,2045 -A2,3.7969,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 -A1,3.3984,r1,2045,r1,power,windturbine,newcapa,2045 -A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 -A2,3.3984,r1,2045,r1,power,windturbine,newcapa,2045 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 +A2,4.7031,r1,2040,r1,residential,gasboiler,newcapa,2045 +A2,3.7969,r1,2040,r1,residential,heatpump,newcapa,2045 +A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 +A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2045 +A1,9.2500,r1,2045,r1,power,windturbine,newcapa,2045 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 +A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2045 +A2,9.2500,r1,2045,r1,power,windturbine,newcapa,2045 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A2,11.7031,r1,2045,r1,residential,gasboiler,newcapa,2050 -A2,3.7969,r1,2045,r1,residential,heatpump,newcapa,2050 +A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A2,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 -A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 -A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 -A1,3.3984,r1,2045,r1,power,windturbine,newcapa,2050 -A1,7.6367,r1,2050,r1,power,windturbine,newcapa,2050 -A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 -A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 -A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 -A2,3.3984,r1,2045,r1,power,windturbine,newcapa,2050 -A2,7.6367,r1,2050,r1,power,windturbine,newcapa,2050 -A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 -A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 -A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 -A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 +A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 +A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2050 +A1,9.2500,r1,2045,r1,power,windturbine,newcapa,2050 +A1,5.3516,r1,2050,r1,power,windturbine,newcapa,2050 +A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 +A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2050 +A2,9.2500,r1,2045,r1,power,windturbine,newcapa,2050 +A2,5.3516,r1,2050,r1,power,windturbine,newcapa,2050 +A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,5.1698,r1,2030,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 7283f612d..ba6eb7521 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.6283,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.7496,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.6283,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.7496,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.6283,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.7496,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.6283,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,19.7496,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.6283,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,19.7496,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.6283,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,18.5111,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.9201,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.6695,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.5111,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.9201,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.6695,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,18.5111,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.9201,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.6695,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.5111,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.9201,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.6695,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,18.5111,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.9201,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.6695,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,18.5111,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.9201,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.6695,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,18.5149,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.9896,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.5760,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,18.5149,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,13.9896,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.1573,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,18.5149,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.9896,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.5760,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,18.5149,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,13.9896,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.1573,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,18.5149,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,13.9896,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.7385,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.5149,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.9896,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.4479,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,18.6565,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.5222,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.8906,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.3878,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,18.6565,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.2365,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,15.8906,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.5565,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,18.6565,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.5222,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.8906,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,13.3878,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,18.6565,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.2365,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,15.8906,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.5565,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,18.6565,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,28.9388,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,15.8906,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.2647,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,18.6565,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.2136,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,15.8906,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.7872,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,18.7239,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.3855,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,17.1952,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.7331,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,18.7239,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.3808,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,17.1952,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.4531,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,18.7239,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.3855,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,17.1952,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.7331,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,18.7239,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.3808,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,17.1952,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.4531,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,18.7239,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.5449,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,17.1952,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,15.2852,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.7239,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.2249,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,17.1952,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.5617,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,18.6255,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.3437,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.8549,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.7516,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.6255,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.9833,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,14.8549,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.5497,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,18.6255,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.3437,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.8549,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.7516,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.6255,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.9833,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,14.8549,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.5497,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,18.6255,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.2048,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.8549,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.0154,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,18.6255,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.8730,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,14.8549,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.8874,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv index eb3195122..9700cd411 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv @@ -17,147 +17,129 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.4142,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,78.7893,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.1213,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,118.1840,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.4142,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,78.7893,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.1213,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,118.1840,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.2425,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,236.3679,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.8284,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,157.5786,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.2066,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.3658,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.6886,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,76.1625,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.3099,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.0487,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,94.2002,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.5330,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,114.2437,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.2066,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.3658,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,141.3004,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.6886,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,76.1625,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.3099,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.0487,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,94.2002,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.5330,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,114.2437,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.6198,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.0974,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,141.3004,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,5.0659,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,228.4874,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.4132,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.7316,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,282.6007,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.1687,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,3.3773,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,152.3249,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.4000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.1916,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,188.4005,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.3622,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.2698,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,66.4447,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.6000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.7874,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,70.8327,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.5432,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.9046,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,99.6671,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.4000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.1916,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,106.2491,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.3622,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.2698,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,66.4447,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.6000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.7874,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,70.8327,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.5432,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.9046,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,99.6671,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.2000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.5748,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,106.2491,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,1.0865,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,3.8093,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,199.3342,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,0.8000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.3832,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,212.4982,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,0.7243,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,2.5395,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,132.8895,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,r1,0.4667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.3849,0,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,r1,141.6655,5,MUS$2010/kt,2035 +electricity,all-week,night,all-year,r1,0.5510,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,1.1086,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,77.2297,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r1,0.7000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,2.0774,1,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,r1,61.8452,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,r1,0.8266,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,1.6630,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,115.8446,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,r1,0.4667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.3849,2,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,r1,92.7679,1,MUS$2010/kt,2040 +electricity,all-week,afternoon,all-year,r1,0.5510,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,1.1086,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,77.2297,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r1,0.7000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,2.0774,3,MUS$2010/PJ,2040 +CO2f,all-week,afternoon,all-year,r1,61.8452,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,r1,0.8266,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,1.6630,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,115.8446,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r1,1.4000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,4.1548,4,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,r1,92.7679,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,r1,1.6531,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,3.3259,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,231.6892,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r1,0.9333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,2.7699,5,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,185.5357,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,r1,1.1021,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,2.2173,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,154.4595,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,r1,0.6177,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,1.3336,0,MUS$2010/PJ,2045 +CO2f,all-week,evening,all-year,r1,123.6905,5,MUS$2010/kt,2040 +electricity,all-week,night,all-year,r1,0.9622,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,0.3031,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,74.3650,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r1,0.9266,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,2.0004,1,MUS$2010/PJ,2045 +CO2f,all-week,night,all-year,r1,16.9077,0,MUS$2010/kt,2045 +electricity,all-week,morning,all-year,r1,1.4432,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,0.4546,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,111.5474,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,r1,0.6177,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,1.3336,2,MUS$2010/PJ,2045 +CO2f,all-week,morning,all-year,r1,25.3616,1,MUS$2010/kt,2045 +electricity,all-week,afternoon,all-year,r1,0.9622,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,0.3031,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,74.3650,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r1,0.9266,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,2.0004,3,MUS$2010/PJ,2045 +CO2f,all-week,afternoon,all-year,r1,16.9077,2,MUS$2010/kt,2045 +electricity,all-week,early-peak,all-year,r1,1.4432,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,0.4546,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,111.5474,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r1,1.8531,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,4.0007,4,MUS$2010/PJ,2045 +CO2f,all-week,early-peak,all-year,r1,25.3616,3,MUS$2010/kt,2045 +electricity,all-week,late-peak,all-year,r1,2.8865,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.9093,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,223.0949,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r1,1.2354,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,2.6672,5,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,50.7232,4,MUS$2010/kt,2045 +electricity,all-week,evening,all-year,r1,1.9243,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,0.6062,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,148.7299,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,r1,0.9399,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.7858,0,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,r1,33.8155,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,43.8075,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,r1,1.4099,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,1.1787,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,65.7112,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,r1,0.9399,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.7858,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,43.8075,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,r1,1.4099,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,1.1787,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,65.7112,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,r1,2.8198,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,2.3574,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,131.4224,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,r1,1.8799,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,1.5716,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,87.6149,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml index 2b0b18ed7..e9b85f741 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 d89a7846c..b45afdea8 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,55 +3,43 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2030 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2035 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2035 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2035 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2035 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2040 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2040 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2040 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2040 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2040 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2045 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2045 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2045 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2045 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2045 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2045 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2050 A1,6.4684,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2050 +A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2050 +A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2050 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2050 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2050 A1,0.3159,r1,2050,r1,power,windturbine,newcapa,2050 -A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2050 +A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 5ad9b6d82..92e23b63d 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.1996,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2723,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3177,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1996,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2378,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3177,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1996,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2723,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.3177,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1996,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2378,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3177,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1996,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.2037,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3177,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1996,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2206,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3177,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,20.3898,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.0082,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.6016,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.8003,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.3898,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.0082,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.6016,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.8003,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,20.3898,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.0082,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.6016,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.8003,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.3898,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.0082,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.6016,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.8003,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,20.3898,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.0082,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.6016,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.8003,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,20.3898,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.0082,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.6016,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.8003,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.4272,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.9783,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.1695,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.8019,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.4272,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.8542,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.1695,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.8019,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.4272,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.9783,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.1695,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.8019,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.4272,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.8542,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.1695,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.8019,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.4272,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.6485,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.1695,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.8019,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.4272,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.7716,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.1695,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.8019,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,22.9589,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.3487,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.7822,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.9900,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,22.9589,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.6966,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.7822,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.3403,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,22.9589,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.3487,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.7822,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.9900,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,22.9589,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.6966,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.7822,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.3403,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.9589,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.8408,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.7822,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.6580,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,22.9589,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.3519,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.7822,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.5073,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,25.1134,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.5488,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.6440,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.1381,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,25.1134,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.5870,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.6440,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.2773,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,25.1134,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.5488,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.6440,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.1381,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,25.1134,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.5870,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.6440,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.2773,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,25.1134,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,22.9936,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.6440,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.7350,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,25.1134,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.0885,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.6440,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,10.3394,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,27.1971,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.7219,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.4775,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.2182,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,27.1971,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.4728,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.4775,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.2334,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,27.1971,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.7219,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.4775,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.2182,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,27.1971,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.4728,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.4775,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.2334,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,27.1971,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,23.1647,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.4775,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.7961,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,27.1971,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.8316,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.4775,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.2340,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv index cf0693509..ea15193b0 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv @@ -17,147 +17,93 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1680,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,0.8751,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0817,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9325,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,48.5650,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.3188,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,60.3400,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,1.6301,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.4053,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,73.1896,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1680,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,0.8751,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,90.9349,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.0817,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,0.9325,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,48.5650,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.3188,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,60.3400,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,1.6301,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.4053,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,73.1896,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,2.6375,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,90.9349,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,3.2602,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8105,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,146.3791,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3383,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,1.7625,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,181.8698,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,2.1786,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8781,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,97.8141,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.2932,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.4829,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,121.5298,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1252,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7609,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,0.9690,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,26.7545,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.4418,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,0.7278,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,42.4490,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.1887,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.1468,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.4603,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,40.3201,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.2932,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.4829,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,63.9724,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1252,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7609,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,0.9690,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,26.7545,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.4418,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,0.7278,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,42.4490,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.1887,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.1468,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.4603,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,40.3201,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.8836,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,1.4556,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,63.9724,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.3774,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.2936,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,2.9206,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,80.6403,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.5905,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,0.9727,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,127.9448,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.2522,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.5326,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,1.9516,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,53.8858,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,85.4958,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.3985,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,0.9963,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,r1,0.6006,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,1.5015,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,r1,0.3985,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,0.9963,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,r1,0.6006,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,1.5015,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,r1,1.2012,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,3.0029,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r1,0.8027,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.0066,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.4094,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,1.0235,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,0.6170,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,1.5425,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.4094,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,1.0235,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,0.6170,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,1.5425,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,1.2340,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,3.0849,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.8246,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,2.0614,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,0.4164,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,1.0410,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,0.6276,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,1.5689,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,0.4164,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,1.0410,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,0.6276,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,1.5689,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,1.2551,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,3.1378,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,0.8387,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,2.0967,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,0.4234,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.2091,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,1.0585,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,11.4775,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,0.6381,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.3151,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,1.5952,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,17.2971,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,0.4234,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.2091,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,1.0585,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,11.4775,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,0.6381,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.3151,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,1.5952,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,17.2971,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,1.2762,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,3.1904,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,0.8528,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.4211,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,2.1319,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,23.1166,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml index 101b35330..bc407b144 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 2218a1769..bb6d8fe58 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -3,45 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2030 -A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2035 -A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2035 -A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2035 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2035 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2040 -A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2040 -A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2040 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2040 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2040 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2040 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2045 -A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2045 -A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2045 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2045 +A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2045 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2045 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2045 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2045 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2050 -A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2050 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2050 +A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2050 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2050 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2050 -A1,11.3438,r1,2050,r1,power,solarPV,newcapa,2050 -A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,6.0000,r1,2050,r1,power,solarPV,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 6081d7753..77e8b6552 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,16.4503,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,26.7448,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3462,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,16.4503,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,25.3056,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3462,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,16.4503,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,26.7448,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.3462,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,16.4503,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,25.3056,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3462,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,16.4503,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,23.8663,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3462,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,16.4503,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,24.5860,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3462,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,10.7076,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.7918,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.7076,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.7918,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,10.7076,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.7918,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.7076,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.7918,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.7076,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.7918,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,10.7076,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.7918,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.6899,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.5465,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.2860,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.3422,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,8.5465,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.2466,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.6899,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.5465,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.2860,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.3422,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,8.5465,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.2466,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.9946,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.5465,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.2071,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.6684,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.5465,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.7268,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.1514,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.5465,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.2734,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.2928,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.5465,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.3343,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.1514,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.5465,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.2734,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.2928,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.5465,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.3343,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,21.2728,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.5465,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.3952,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.8636,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.5465,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8648,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.4969,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.5465,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.0580,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.1696,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.5465,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.5146,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.4969,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.5465,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.0580,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.1696,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.5465,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.5146,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,23.7374,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,8.5465,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.1065,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,11.5060,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.5465,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.7428,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.0219,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.5465,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.7962,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,10.4499,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.5465,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.0653,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.0219,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.5465,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.7962,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,10.4499,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.5465,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.0653,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,23.7526,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.5465,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.0924,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,13.0378,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.5465,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.1998,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv index 1c14d9546..101c2f4e0 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv @@ -17,66 +17,72 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1408,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,63.5640,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7112,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,95.3460,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.1408,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,63.5640,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7112,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,95.3460,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.2816,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,127.1279,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,61.5082,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,61.5082,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,123.0164,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,82.0109,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml index b278590d1..fa90ff37b 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml +++ b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 4215e0104..bb6d8fe58 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,51 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2030 -A1,5.6562,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2035 -A1,17.4062,r1,2035,r1,power,solarPV,newcapa,2035 -A1,5.6562,r1,2030,r1,power,windturbine,newcapa,2035 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2040 -A1,17.4062,r1,2035,r1,power,solarPV,newcapa,2040 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2040 -A1,5.6562,r1,2030,r1,power,windturbine,newcapa,2040 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2040 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2045 -A1,17.4062,r1,2035,r1,power,solarPV,newcapa,2045 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2045 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2045 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2045 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2045 -A1,5.6562,r1,2030,r1,power,windturbine,newcapa,2045 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2050 -A1,17.4062,r1,2035,r1,power,solarPV,newcapa,2050 -A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2050 +A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2050 +A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2050,r1,power,solarPV,newcapa,2050 -A1,5.6562,r1,2030,r1,power,windturbine,newcapa,2050 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index bd5326093..c554be553 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.3395,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.3515,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.8150,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.0427,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.3395,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.3515,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.8150,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.0427,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.3395,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.3515,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,11.8150,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.0427,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.3395,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.3515,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.8150,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.0427,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.3395,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.3515,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.8150,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.0427,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.3395,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.3515,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.8150,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.0427,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,18.5666,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,13.1453,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,10.0240,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.8131,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,18.5666,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.8582,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.0240,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.7956,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,18.5666,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,13.1453,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,10.0240,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.8131,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,18.5666,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.8582,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.0240,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.7956,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,18.5666,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.5712,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.0240,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.7781,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,18.5666,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.2147,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.0240,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.2869,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,18.7139,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.4542,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.0830,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.8555,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,18.7139,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.5662,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.0830,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.9407,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,18.7139,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,12.4542,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.0830,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.8555,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,18.7139,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.5662,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.0830,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.9407,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,18.7139,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.2448,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.0830,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.0259,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.7139,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.1223,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.0830,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.4833,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,19.0624,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.6984,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,10.2224,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.5791,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.0624,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.3183,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.2224,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.0239,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,19.0624,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.6984,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,10.2224,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.5791,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.0624,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.3183,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.2224,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.0239,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,19.0624,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.4985,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,10.2224,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.4953,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,19.0624,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.6282,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,10.2224,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.2463,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,19.3334,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.1476,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.3308,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.2768,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.3334,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.5143,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.3308,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.5247,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,19.3334,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.1476,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.3308,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.2768,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.3334,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.5143,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.3308,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.5247,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.3334,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,24.3825,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,10.3308,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.3968,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.3334,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,13.9825,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.3308,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.6487,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv index c6e0743ad..101c2f4e0 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv @@ -17,147 +17,105 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.9334,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,51.8913,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.4001,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,77.8369,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.9334,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,51.8913,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.4001,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,77.8369,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.8001,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,155.6738,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.8668,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,103.7826,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.1983,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,10.8858,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.2975,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,16.3287,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.1983,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,10.8858,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.2975,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,16.3287,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.5949,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,32.6574,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.3966,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,21.7716,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.1983,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,10.8858,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.2975,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,16.3287,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.1983,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,10.8858,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.2975,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,16.3287,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.5949,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,32.6574,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.3966,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,21.7716,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.1983,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,10.8858,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.2975,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,16.3287,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.1983,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,10.8858,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.2975,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,16.3287,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.5949,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,32.6574,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.3966,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,21.7716,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.1983,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,10.8858,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.2975,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,16.3287,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.1983,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,10.8858,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.2975,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,16.3287,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.5949,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,32.6574,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.3966,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,21.7716,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml index b278590d1..fa90ff37b 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml +++ b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-region/1-new-region/settings.toml b/docs/tutorial-code/add-region/1-new-region/settings.toml index 625376e83..bb7d3b548 100644 --- a/docs/tutorial-code/add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/add-region/1-new-region/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv index 3a0509853..17cb547ad 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv @@ -4,70 +4,65 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2030 -A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2030 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2030 +A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2030 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2035 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2035 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2035 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2040 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2040 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2040 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2045 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2045 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2045 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,electric_stove,newcapa,2050 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,0.1806,r1,2050,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2050 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2050 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,12.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.5938,r1,2050,r1,power,windturbine,newcapa,2050 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv index 88431f045..e1a14c71f 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.2650,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.2650,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.2650,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.2650,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,10.2650,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,10.2650,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,22.4425,r1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,21.7330,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.5843,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.4864,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,11.7062,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,22.4425,r1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,11.7615,r1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.7330,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.5843,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.4864,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,11.7062,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,22.4425,r1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,11.7615,r1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.7330,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.5843,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.4864,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,11.7062,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,22.4425,r1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,11.7615,r1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.7330,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.5843,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.4864,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,11.7062,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,22.4425,r1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,11.7615,r1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,33.3662,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.5843,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.6642,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,11.7062,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,22.4425,r1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,12.9394,r1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,27.5496,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.5843,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,14.0753,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,11.7062,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,22.4752,r1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,12.3504,r1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.9827,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.5875,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.2893,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,11.5875,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,22.4752,r1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.9902,r1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.2477,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.5875,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.7474,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.5875,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,22.4752,r1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,11.4483,r1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.9827,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.5875,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.2893,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,11.5875,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,22.4752,r1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.9902,r1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.2477,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.5875,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.7474,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.5875,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,22.4752,r1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,11.4483,r1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.5128,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5875,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.2056,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,11.5875,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,22.4752,r1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,11.9065,r1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.8803,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.5875,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.9765,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,11.5875,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,23.7051,r1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,11.6774,r1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,19.4632,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.0795,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,12.0795,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,23.7051,r1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.8556,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.0795,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,12.0795,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,23.7051,r1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,19.4632,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.0795,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,12.0795,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,23.7051,r1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.8556,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.0795,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,12.0795,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,23.7051,r1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,27.7346,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.0795,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,12.0795,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,23.7051,r1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.5518,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.0795,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,12.0795,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,25.2863,r1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,19.6913,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.7119,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,12.7119,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,25.2863,r1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.1764,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.7119,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,12.7119,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,25.2863,r1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.6913,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.7119,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,12.7119,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,25.2863,r1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.1764,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.7119,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,12.7119,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,25.2863,r1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,31.0576,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.7120,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,12.7120,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,25.2863,r1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.4189,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.7120,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,12.7120,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,26.5162,r1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,20.3427,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.2039,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,13.2039,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,26.5162,r1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.1568,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.2039,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,13.2039,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,26.5162,r1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.3427,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.2039,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,13.2039,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,26.5162,r1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.1568,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.2039,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,13.2039,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,26.5162,r1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,31.4621,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.2039,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,13.2039,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,26.5162,r1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.8197,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.2039,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,13.2039,r1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv index 3433fd8fc..a14c3c1af 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv @@ -23,183 +23,177 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,2.6782,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,135.4920,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.0173,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,203.2380,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,2.6782,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,135.4920,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.0173,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,203.2380,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,8.0346,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,406.4760,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,5.3564,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,270.9840,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.8264,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,2.5684,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,3.4515,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,132.9753,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,173.7287,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,1.2396,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,3.8526,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,5.1773,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,199.4629,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,260.5930,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.8264,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,2.5684,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,3.4515,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,132.9753,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,173.7287,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,1.2396,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,3.8526,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,5.1773,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,199.4629,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,260.5930,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,2.4792,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,7.7052,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,9.5092,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,398.9258,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,474.7781,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,1.6528,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,5.1368,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,6.6213,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,265.9505,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,331.9880,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,1.6000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,1.4486,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.2845,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,r1,68.1152,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,2.4000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,2.1729,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.5040,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,r1,78.9688,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,1.6000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,1.4486,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.2845,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,r1,68.1152,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,2.4000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,2.1729,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.5040,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,r1,78.9688,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,4.8000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,4.3458,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,2.1625,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,111.5298,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,3.2000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,2.8972,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,1.7235,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,89.8225,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,1.8667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2040 +CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2040 cook,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,2.8000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2040 +CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2040 +CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,2.8000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2040 +CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,2.1333,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2045 +CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2045 cook,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r1,3.2000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2045 +CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r1,2.1333,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2045 +CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,3.2000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2045 +CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,6.4000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,4.2667,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2045 +CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,2.4000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,0.8907,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,r1,48.8907,0,MUS$2010/kt,2050 cook,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,3.6000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,0.8907,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,r1,48.8907,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r1,2.4000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,0.8907,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,r1,48.8907,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,3.6000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,0.8907,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,r1,48.8907,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,7.2000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.8907,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,48.8907,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,4.8000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,0.8907,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r1,48.8907,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml index dcd02ad56..7fcfcc07e 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -50,6 +51,7 @@ commodities = ["cook"] [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -61,6 +63,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv index ae5304fbb..4301e82bc 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv @@ -4,78 +4,60 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 A1,11.0000,r1,2030,r1,residential,gas_stove,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 A1,11.0000,r1,2030,r1,residential,gas_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,gas_stove,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2035 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 A1,25.0000,r1,2035,r1,residential,gas_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,gas_stove,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2040 -A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2040 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 A1,17.0000,r1,2040,r1,residential,gas_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,gas_stove,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2045 -A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2045 -A1,7.7333,r1,2045,r1,gas,gassupply1,newcapa,2045 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,1.8208,r1,2045,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 A1,31.0000,r1,2045,r1,residential,gas_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,gas_stove,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2050 -A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2050 -A1,7.7333,r1,2045,r1,gas,gassupply1,newcapa,2050 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,1.8208,r1,2045,r1,gas,gassupply1,newcapa,2050 A1,7.7333,r1,2050,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv index 9fb811274..46f1fe069 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,21.3025,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.3017,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 cook,all-week,night,all-year,11.9211,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,21.3025,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.3017,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,11.9211,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,21.3025,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.3017,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,11.9211,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,21.3025,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.3017,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,11.9211,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,21.3025,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.3017,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,11.9211,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,21.3025,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.3017,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,11.9211,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,21.3268,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.1281,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.1761,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 cook,all-week,night,all-year,14.8150,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,21.3268,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.1281,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,14.8150,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,21.3268,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.1281,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.1761,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,14.8150,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,21.3268,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.1281,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,14.8150,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,21.3268,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.1281,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,14.8151,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,21.3268,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.1281,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,14.8150,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,22.2411,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.4939,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 cook,all-week,night,all-year,17.7090,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,22.2411,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.4939,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,17.7090,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,22.2411,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.4939,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,17.7090,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,22.2411,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.4939,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,17.7090,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,22.2411,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.4939,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,17.7090,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,22.2411,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.4939,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,17.7090,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,23.4166,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.9641,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 cook,all-week,night,all-year,21.7686,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,23.4166,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.9641,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,21.7686,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,23.4166,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.9641,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,21.7686,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,23.4166,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.9641,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,21.7686,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,23.4166,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.9641,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,21.7686,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,23.4166,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.9641,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,21.7686,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,24.3309,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.3298,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.4490,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 cook,all-week,night,all-year,25.8281,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,24.3309,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.3298,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.6562,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,25.8281,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,24.3309,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,12.3298,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.4490,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,25.8281,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,24.3309,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.3298,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.6562,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,25.8281,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,24.3309,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.3298,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.0961,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,25.8281,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,24.3309,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.3298,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.9090,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,25.8281,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv index 4f212a1f9..9e4096996 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv @@ -23,183 +23,177 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,2.8858,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,141.1164,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.3287,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,211.6747,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,2.8858,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,141.1164,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.3287,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,211.6747,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,8.6573,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,423.3493,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,5.7715,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,282.2329,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,3.0766,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,3.3773,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,146.7470,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,163.8838,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,4.6149,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,5.0659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,220.1205,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,245.8257,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,3.0766,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,3.3773,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,146.7470,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,163.8838,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,4.6149,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,5.0659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,220.1205,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,245.8257,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,9.2299,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,10.1319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,440.2411,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,491.6514,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,6.1532,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,6.7546,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,293.4940,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,327.7676,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,2.7282,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,2.5395,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,122.4082,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,r1,112.2455,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,4.0923,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,3.8093,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,183.6123,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,r1,168.3682,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,2.7282,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,2.5395,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,122.4082,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,r1,112.2455,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,4.0923,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,3.8093,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,183.6123,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,r1,168.3682,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,8.1847,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,7.6185,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,367.2247,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,336.7364,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,5.4564,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,5.0790,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,244.8164,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,224.4909,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,3.1149,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,2.7067,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,139.0749,0,MUS$2010/kt,2040 +CO2f,all-week,night,all-year,r1,116.6667,0,MUS$2010/kt,2040 cook,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,4.6723,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,4.0600,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,208.6123,1,MUS$2010/kt,2040 +CO2f,all-week,morning,all-year,r1,175.0000,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,3.1149,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,2.7067,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,139.0749,2,MUS$2010/kt,2040 +CO2f,all-week,afternoon,all-year,r1,116.6667,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,4.6723,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,4.0600,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,208.6123,3,MUS$2010/kt,2040 +CO2f,all-week,early-peak,all-year,r1,175.0000,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,9.3447,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,8.1200,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,417.2247,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,350.0000,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,6.2298,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,5.4133,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,278.1498,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,233.3333,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,3.5016,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,155.7416,0,MUS$2010/kt,2045 +CO2f,all-week,night,all-year,r1,133.3333,0,MUS$2010/kt,2045 cook,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,5.2523,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,233.6123,1,MUS$2010/kt,2045 +CO2f,all-week,morning,all-year,r1,200.0000,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,3.5016,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,155.7416,2,MUS$2010/kt,2045 +CO2f,all-week,afternoon,all-year,r1,133.3333,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,5.2523,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,233.6123,3,MUS$2010/kt,2045 +CO2f,all-week,early-peak,all-year,r1,200.0000,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,10.5047,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,467.2247,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,400.0000,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,7.0031,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,311.4831,5,MUS$2010/kt,2045 +CO2f,all-week,evening,all-year,r1,266.6667,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,3.8882,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,3.4800,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,172.4082,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,r1,150.0000,0,MUS$2010/kt,2050 cook,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,5.8323,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,5.2200,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,258.6123,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,r1,225.0000,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,3.8882,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,3.4800,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,172.4082,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,r1,150.0000,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,5.8323,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,5.2200,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,258.6123,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,r1,225.0000,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,11.6647,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,10.4400,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,517.2247,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,450.0000,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,7.7764,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,6.9600,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,344.8164,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r1,300.0000,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml b/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml index a6fb4b2ca..8293dab32 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -50,6 +51,7 @@ commodities = ["cook"] [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -61,6 +63,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 3e1070faa..a0440b601 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,71 +3,66 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 -A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2030 -A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2030 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2030 +A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2030 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2035 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2035 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2035 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2040 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2040 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2040 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2045 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2045 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2045 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,electric_stove,newcapa,2050 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,0.1806,r1,2050,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2050 -A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2050 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,12.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.5938,r1,2050,r1,power,windturbine,newcapa,2050 +A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,9.0279,r1,2030,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 88431f045..e1a14c71f 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.2650,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.2650,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.2650,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.2650,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,10.2650,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,10.2650,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,22.4425,r1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,21.7330,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.5843,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.4864,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,11.7062,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,22.4425,r1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,11.7615,r1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.7330,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.5843,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.4864,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,11.7062,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,22.4425,r1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,11.7615,r1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.7330,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.5843,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.4864,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,11.7062,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,22.4425,r1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,11.7615,r1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.7330,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.5843,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.4864,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,11.7062,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,22.4425,r1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,11.7615,r1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,33.3662,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.5843,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.6642,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,11.7062,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,22.4425,r1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,12.9394,r1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,27.5496,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.5843,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,14.0753,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,11.7062,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,22.4752,r1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,12.3504,r1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.9827,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.5875,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.2893,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,11.5875,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,22.4752,r1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.9902,r1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.2477,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.5875,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.7474,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.5875,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,22.4752,r1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,11.4483,r1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.9827,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.5875,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.2893,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,11.5875,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,22.4752,r1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.9902,r1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.2477,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.5875,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.7474,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.5875,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,22.4752,r1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,11.4483,r1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.5128,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5875,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.2056,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,11.5875,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,22.4752,r1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,11.9065,r1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.8803,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.5875,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.9765,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,11.5875,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,23.7051,r1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,11.6774,r1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,19.4632,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.0795,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,12.0795,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,23.7051,r1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.8556,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.0795,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,12.0795,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,23.7051,r1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,19.4632,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,12.0795,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,12.0795,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,23.7051,r1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.8556,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.0795,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,12.0795,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,23.7051,r1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,27.7346,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.0795,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,12.0795,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,23.7051,r1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.5518,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.0795,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,12.0795,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,25.2863,r1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,19.6913,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,12.7119,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,12.7119,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,25.2863,r1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,18.1764,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,12.7119,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,12.7119,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,25.2863,r1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.6913,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,12.7119,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,12.7119,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,25.2863,r1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,18.1764,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,12.7119,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,12.7119,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,25.2863,r1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,31.0576,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.7120,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,12.7120,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,25.2863,r1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.4189,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,12.7120,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,12.7120,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,26.5162,r1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,20.3427,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.2039,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,13.2039,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,26.5162,r1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.1568,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.2039,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,13.2039,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,26.5162,r1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.3427,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.2039,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,13.2039,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,26.5162,r1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.1568,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.2039,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,13.2039,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,26.5162,r1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,31.4621,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.2039,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,13.2039,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,26.5162,r1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.8197,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.2039,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,13.2039,r1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv index 3433fd8fc..a14c3c1af 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv @@ -23,183 +23,177 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,2.6782,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,135.4920,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.0173,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,203.2380,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,2.6782,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,135.4920,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.0173,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,203.2380,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,8.0346,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,406.4760,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,5.3564,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,270.9840,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.8264,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,2.5684,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,3.4515,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,132.9753,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,173.7287,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,1.2396,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,3.8526,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,5.1773,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,199.4629,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,260.5930,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.8264,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,2.5684,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,3.4515,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,132.9753,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,173.7287,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,1.2396,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,3.8526,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,5.1773,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,199.4629,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,260.5930,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,2.4792,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,7.7052,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,9.5092,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,398.9258,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,474.7781,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,1.6528,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,5.1368,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,6.6213,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,265.9505,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,331.9880,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,1.6000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,1.4486,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.2845,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,r1,68.1152,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,2.4000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,2.1729,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.5040,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,r1,78.9688,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,1.6000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,1.4486,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.2845,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,r1,68.1152,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,2.4000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,2.1729,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.5040,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,r1,78.9688,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,4.8000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,4.3458,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,2.1625,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,111.5298,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,3.2000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,2.8972,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,1.7235,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,89.8225,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,1.8667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2040 +CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2040 cook,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,2.8000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2040 +CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2040 +CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,2.8000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2040 +CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,2.1333,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2045 +CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2045 cook,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r1,3.2000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2045 +CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r1,2.1333,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2045 +CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,3.2000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2045 +CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,6.4000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,4.2667,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2045 +CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,2.4000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,1.0983,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,0.8907,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,60.2858,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,r1,48.8907,0,MUS$2010/kt,2050 cook,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,3.6000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,1.6474,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,0.8907,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,90.4286,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,r1,48.8907,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r1,2.4000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,1.0983,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,0.8907,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,60.2858,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,r1,48.8907,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,3.6000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,1.6474,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,0.8907,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,90.4286,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,r1,48.8907,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,7.2000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.8907,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,48.8907,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,4.8000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,2.1965,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,0.8907,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,120.5715,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r1,48.8907,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml index 2b0b18ed7..e9b85f741 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 284eb16ff..640bbb19a 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 @@ -18,9 +18,7 @@ A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2030 A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,7.5938,r1,2035,r1,power,gasCCGT,newcapa,2035 A1,5.3437,r1,2025,r1,power,windturbine,newcapa,2035 A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2035 -A1,0.3203,r1,2035,r1,power,windturbine,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,4.8657,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 bbd999e3f..f826926ac 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 @@ -29,93 +29,93 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,24.3529,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,36.1266,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,21.6327,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,23.8187,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.3300,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,24.3529,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,33.1319,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,21.6327,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,23.0917,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.3300,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,24.3529,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,36.1266,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,21.6327,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,23.8187,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.3300,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,24.3529,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,33.1319,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,21.6327,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,23.0917,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.3300,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,24.3529,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,30.1372,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,21.6327,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,22.3647,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.3300,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,24.3529,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,31.6345,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,21.6327,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,22.7282,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.3300,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.2840,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.7393,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,14.3222,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.3300,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.0471,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.7393,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.5031,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.3300,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.2840,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.7393,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,14.3222,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.3300,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.0471,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.7393,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.5031,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.3300,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.8103,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,15.7393,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,16.6840,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.3300,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.4287,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,15.7393,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,16.0935,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.3300,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,17.7345,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.2242,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.6912,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5110,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.0900,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.7345,r1,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.1500,r1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,11.5519,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.6912,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.4163,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.0900,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,17.7345,r1,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.1500,r1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,11.2242,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.6912,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5110,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.0900,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.7345,r1,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.1500,r1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,11.5519,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.6912,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.4163,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.0900,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,17.7345,r1,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.1500,r1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,28.1123,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.6912,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.3215,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.0900,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.7345,r1,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.1500,r1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,19.2784,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.6912,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.3689,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.0900,r1,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,0.1500,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 4d182c735..1aceb81be 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 @@ -17,30 +17,30 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1408,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3078,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,63.5640,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,72.7310,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7112,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.8364,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,95.3460,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.1408,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,102.2212,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3078,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,63.5640,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,72.7310,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7112,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.8364,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,95.3460,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,102.2212,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.2816,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.3651,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,127.1279,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,131.7114,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 @@ -66,26 +66,14 @@ gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,r1,82.0109,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.6341,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,34.8060,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.9511,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,52.2089,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.6341,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,34.8060,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.9511,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,52.2089,3,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,1.9022,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,104.4179,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,1.2682,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,69.6119,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml index 25be92f81..39a727621 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -55,6 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 9af633cd5..a9a92b5e1 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,11.0936,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.6587,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.7069,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.3110,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,11.0936,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.7240,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.7069,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.6795,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.7475,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,17.6587,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.0804,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.3110,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,11.0936,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.7240,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.7069,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.6795,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.0936,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,13.7892,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.7069,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.0480,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.2149,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,14.7566,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.9601,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.3638,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,5.1246,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.8054,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.2909,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.8540,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.8054,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.7197,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,5.1246,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.8054,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.2909,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.8540,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.8054,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.7197,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.5834,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.8054,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.1484,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.7187,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.8054,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.9340,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,4.4966,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,4.6473,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,4.6188,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.3390,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,4.4966,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,4.6473,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,4.6188,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.3390,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.2436,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.0308,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.7094,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.6849,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,4.3255,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,4.3961,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,5.3842,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,4.4449,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,4.3255,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,4.3961,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,5.3842,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,4.4449,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,10.8382,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,7.0949,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.3405,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.6812,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,4.1865,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,4.3276,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,5.5136,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,4.7511,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,4.1865,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,4.3276,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,5.5136,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,4.7511,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,11.2657,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,6.9327,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,6.6442,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.5336,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.4748,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,4.2720,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.9496,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,4.8028,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.4748,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,4.2720,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.9496,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,4.8028,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,11.9409,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.1037,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,6.1889,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.2551,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv index 1de3c0add..224c5710e 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv @@ -24,26 +24,26 @@ gas,all-week,evening,all-year,r1,2.2117,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,123.1283,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1501,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,64.0732,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7251,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,96.1099,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.2132,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.2243,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,68.1475,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7251,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,96.1099,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4502,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,192.2197,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3931,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,r1,2.3929,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,r1,133.2393,5,MUS$2010/kt,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 2f79f812f..8f2a29e27 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,145 +1,108 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,MUS$2010/PJ,2020 -0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,MUS$2010/kt,2020 -0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,MUS$2010/PJ,2020 -0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,MUS$2010/kt,2020 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,MUS$2010/PJ,2020 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,MUS$2010/kt,2020 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,MUS$2010/PJ,2020 -0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,MUS$2010/kt,2020 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1333,gasCCGT,4,MUS$2010/PJ,2020 -0,CO2f,all-week,late-peak,2020,all-year,r1,12.2227,gasCCGT,4,MUS$2010/kt,2020 -0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,MUS$2010/PJ,2020 -0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,MUS$2010/kt,2020 -0,electricity,all-week,night,2020,all-year,r1,0.0556,gasCCGT,0,MUS$2010/PJ,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.0833,gasCCGT,1,MUS$2010/PJ,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,MUS$2010/PJ,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,MUS$2010/kt,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0833,gasCCGT,3,MUS$2010/PJ,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,MUS$2010/PJ,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,MUS$2010/PJ,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,MUS$2010/kt,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2030 -2,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2030 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2035 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2035 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2035 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2035 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2035 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2035 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2040 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2040 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2040 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2040 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2040 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2040 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2040 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2040 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2040 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2045 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2045 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2045 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2045 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2045 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2045 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2045 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2050 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -5,electricity,all-week,night,2050,all-year,r1,0.2465,windturbine,0,MUS$2010/PJ,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2050 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -5,electricity,all-week,morning,2050,all-year,r1,0.3698,windturbine,1,MUS$2010/PJ,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2050 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -5,electricity,all-week,afternoon,2050,all-year,r1,0.2465,windturbine,2,MUS$2010/PJ,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2050 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -5,electricity,all-week,early-peak,2050,all-year,r1,0.3698,windturbine,3,MUS$2010/PJ,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,MUS$2010/PJ,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2050 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -5,electricity,all-week,evening,2050,all-year,r1,0.4931,windturbine,5,MUS$2010/PJ,2050 +asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,2020 +0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,2020 +0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,2020 +0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,2020 +0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,2020 +0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,2020 +0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,2020 +0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,2020 +0,electricity,all-week,late-peak,2020,all-year,r1,0.1333,gasCCGT,4,2020 +0,CO2f,all-week,late-peak,2020,all-year,r1,12.2227,gasCCGT,4,2020 +0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2020 +0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2020 +0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,r1,0.1708,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2030 +2,electricity,all-week,night,2030,all-year,r1,0.0736,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,r1,0.2802,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2030 +2,electricity,all-week,afternoon,2030,all-year,r1,0.0736,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,r1,0.2802,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,r1,0.4868,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,r1,0.4604,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,r1,0.8604,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,r1,0.4604,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,r1,0.8604,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,r1,0.5937,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,r1,0.5937,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,r1,0.7271,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,r1,0.7271,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,r1,0.9000,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,r1,0.3000,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,r1,0.9000,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,r1,0.9000,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,r1,0.3000,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,r1,0.9000,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,r1,0.3396,windturbine,5,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml index 999bb1797..2f4408094 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' technodata_timeslices = '{path}/power/TechnodataTimeslices.csv' commodities_in = '{path}/power/CommIn.csv' @@ -61,6 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 95df32cd7..d274e03ca 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,11.4949,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.1462,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.7030,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.3727,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,11.4949,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.0584,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.7030,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.7219,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,13.7447,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.1462,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.1871,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.3727,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,11.4949,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.0584,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.7030,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.7219,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,9.9296,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.9267,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.3662,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.7456,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,9.9296,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,13.4486,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.3662,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.9083,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,4.0308,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.8054,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.0197,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.6081,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.8054,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.6587,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,4.0308,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.8054,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.0197,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.6081,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.8054,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.6587,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.3763,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,8.8054,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.3450,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,7.9922,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.8054,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.0018,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,4.4583,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,4.2098,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,4.6297,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.2407,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,4.4583,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,4.2098,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,4.6297,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.2407,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.2509,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.3479,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.7203,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.7943,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,4.3124,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,4.3808,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,5.3885,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,4.4493,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,4.3124,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,4.3808,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,5.3885,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,4.4493,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,10.8404,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,7.0978,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,7.3437,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.6855,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,4.1833,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,4.3224,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,5.5147,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,4.7528,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,4.1833,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,4.3224,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,5.5147,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,4.7528,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,11.2662,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,6.9336,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,6.6450,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.5349,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.1999,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,4.4824,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.4774,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,4.2707,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.1999,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,4.8250,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.4774,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,4.8033,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.1999,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,4.4824,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.4774,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,4.2707,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.1999,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,4.8250,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.4774,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,4.8033,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.1999,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,12.0251,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.4774,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,7.1039,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.1999,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,6.2421,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.4774,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.2554,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv index e58e0699f..d0d44e9ca 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv @@ -22,29 +22,29 @@ gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.1370,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,63.3534,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.7054,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,95.0301,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.2210,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.2243,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,68.1475,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.7054,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,95.0301,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.3110,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,184.5806,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.2074,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.2537,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,123.0537,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,125.6001,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index c67f88a5b..7a50404ae 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,141 +1,103 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,MUS$2010/PJ,2020 -0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,MUS$2010/kt,2020 -0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,MUS$2010/PJ,2020 -0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,MUS$2010/kt,2020 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,MUS$2010/PJ,2020 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,MUS$2010/kt,2020 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,MUS$2010/PJ,2020 -0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,MUS$2010/kt,2020 -0,electricity,all-week,night,2020,all-year,r1,0.0477,gasCCGT,0,MUS$2010/PJ,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1210,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,night,2020,all-year,r1,4.3730,gasCCGT,0,MUS$2010/kt,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.0716,gasCCGT,1,MUS$2010/PJ,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.1816,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,6.5594,gasCCGT,1,MUS$2010/kt,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,MUS$2010/PJ,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1210,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,MUS$2010/kt,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0716,gasCCGT,3,MUS$2010/PJ,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1816,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,6.5594,gasCCGT,3,MUS$2010/kt,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.0833,gasCCGT,4,MUS$2010/PJ,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,7.6392,gasCCGT,4,MUS$2010/kt,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.0556,gasCCGT,5,MUS$2010/PJ,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.2819,windturbine,5,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,5.0928,gasCCGT,5,MUS$2010/kt,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1410,windturbine,0,MUS$2010/PJ,2030 -2,electricity,all-week,night,2030,all-year,r1,0.2722,windturbine,0,MUS$2010/PJ,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.2115,windturbine,1,MUS$2010/PJ,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.4083,windturbine,1,MUS$2010/PJ,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1410,windturbine,2,MUS$2010/PJ,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.2722,windturbine,2,MUS$2010/PJ,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.2115,windturbine,3,MUS$2010/PJ,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.4083,windturbine,3,MUS$2010/PJ,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,MUS$2010/PJ,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,MUS$2010/PJ,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.2819,windturbine,5,MUS$2010/PJ,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.5444,windturbine,5,MUS$2010/PJ,2030 -0,electricity,all-week,night,2025,all-year,r1,0.1410,windturbine,0,MUS$2010/PJ,2035 -1,electricity,all-week,night,2030,all-year,r1,0.2722,windturbine,0,MUS$2010/PJ,2035 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.2115,windturbine,1,MUS$2010/PJ,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.4083,windturbine,1,MUS$2010/PJ,2035 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1410,windturbine,2,MUS$2010/PJ,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.2722,windturbine,2,MUS$2010/PJ,2035 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.2115,windturbine,3,MUS$2010/PJ,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4083,windturbine,3,MUS$2010/PJ,2035 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,MUS$2010/PJ,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,MUS$2010/PJ,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.2819,windturbine,5,MUS$2010/PJ,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.5444,windturbine,5,MUS$2010/PJ,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2035 -0,electricity,all-week,night,2025,all-year,r1,0.1410,windturbine,0,MUS$2010/PJ,2040 -1,electricity,all-week,night,2030,all-year,r1,0.2722,windturbine,0,MUS$2010/PJ,2040 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2040 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.2115,windturbine,1,MUS$2010/PJ,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.4083,windturbine,1,MUS$2010/PJ,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2040 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1410,windturbine,2,MUS$2010/PJ,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.2722,windturbine,2,MUS$2010/PJ,2040 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2040 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.2115,windturbine,3,MUS$2010/PJ,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4083,windturbine,3,MUS$2010/PJ,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2040 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,MUS$2010/PJ,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,MUS$2010/PJ,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.2819,windturbine,5,MUS$2010/PJ,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.5444,windturbine,5,MUS$2010/PJ,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2040 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2040 -0,electricity,all-week,night,2025,all-year,r1,0.1410,windturbine,0,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.2722,windturbine,0,MUS$2010/PJ,2045 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2045 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.2115,windturbine,1,MUS$2010/PJ,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.4083,windturbine,1,MUS$2010/PJ,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2045 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1410,windturbine,2,MUS$2010/PJ,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.2722,windturbine,2,MUS$2010/PJ,2045 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2045 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.2115,windturbine,3,MUS$2010/PJ,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4083,windturbine,3,MUS$2010/PJ,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2045 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,MUS$2010/PJ,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,MUS$2010/PJ,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.2819,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.5444,windturbine,5,MUS$2010/PJ,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2045 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.2722,windturbine,0,MUS$2010/PJ,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2050 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -5,electricity,all-week,night,2050,all-year,r1,0.2743,windturbine,0,MUS$2010/PJ,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.4083,windturbine,1,MUS$2010/PJ,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2050 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -5,electricity,all-week,morning,2050,all-year,r1,0.4115,windturbine,1,MUS$2010/PJ,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.2722,windturbine,2,MUS$2010/PJ,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2050 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -5,electricity,all-week,afternoon,2050,all-year,r1,0.2743,windturbine,2,MUS$2010/PJ,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4083,windturbine,3,MUS$2010/PJ,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2050 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -5,electricity,all-week,early-peak,2050,all-year,r1,0.4115,windturbine,3,MUS$2010/PJ,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,MUS$2010/PJ,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.8229,windturbine,4,MUS$2010/PJ,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.5444,windturbine,5,MUS$2010/PJ,2050 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -5,electricity,all-week,evening,2050,all-year,r1,0.5486,windturbine,5,MUS$2010/PJ,2050 +asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,2020 +0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,2020 +0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,2020 +0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,2020 +0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,2020 +0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,2020 +0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,2020 +0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,2020 +0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,r1,0.0833,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,r1,7.6392,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,r1,0.0833,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,r1,7.6392,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,r1,0.2542,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,r1,0.4132,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,r1,0.1969,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,r1,0.4132,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,r1,0.1969,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,r1,0.4035,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,r1,0.3771,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,r1,0.7771,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,r1,0.3771,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,r1,0.7771,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,r1,0.5104,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,r1,0.5104,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,r1,0.6438,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,r1,0.6438,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,r1,0.8167,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,r1,0.3833,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,r1,0.9833,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,r1,0.8167,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,r1,0.3833,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,r1,0.9833,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,r1,0.8229,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,r1,0.4000,windturbine,5,2050 +4,electricity,all-week,evening,2045,all-year,r1,0.0229,windturbine,5,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml index 999bb1797..2f4408094 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml @@ -33,6 +33,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -44,6 +45,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' technodata_timeslices = '{path}/power/TechnodataTimeslices.csv' commodities_in = '{path}/power/CommIn.csv' @@ -61,6 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 f5f65cf30..a744feeeb 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,56 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,9.8062,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,17.4000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,9.8062,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,10.6000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,17.4000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.0063,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,10.6000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.0063,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,23.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2035 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,23.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,16.2000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2040 -A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2040 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,16.2000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,28.6000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2045 -A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2045 A1,5.6000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,28.6000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,21.8000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2050 -A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2050 A1,5.6000,r1,2045,r1,power,windturbine,newcapa,2050 A1,5.6000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 2742e1a6b..94cde9d79 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 @@ -39,243 +39,243 @@ gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.0108,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.0346,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.3597,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.7988,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.0108,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,26.4347,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.3597,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.7988,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,20.0108,r1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,27.0346,r1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,11.3597,r1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,11.7988,r1,2,MUS$2010/PJ,2025 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.0108,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,26.4347,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.3597,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.7988,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.0108,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,25.7015,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.3597,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.7988,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.0108,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,26.0348,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3597,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.7988,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,20.0108,r1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,26.0348,r1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,11.3597,r1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,11.7988,r1,6,MUS$2010/PJ,2025 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.1201,r1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,20.0108,r1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,26.0348,r1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,11.3597,r1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,11.7988,r1,7,MUS$2010/PJ,2025 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.1201,r1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,20.8598,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.3194,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.0148,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.8971,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.8598,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.3194,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.0148,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.8971,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,20.8598,r1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,17.3194,r1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,12.0148,r1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,12.8971,r1,2,MUS$2010/PJ,2030 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.8598,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.3194,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.0148,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.8971,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,20.8598,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.3194,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.0148,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.8971,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,20.8598,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.3194,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.0148,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.8971,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,20.8598,r1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,17.3194,r1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,12.0148,r1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,12.8971,r1,6,MUS$2010/PJ,2030 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.1570,r1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,20.8598,r1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,17.3194,r1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,12.0148,r1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,12.8971,r1,7,MUS$2010/PJ,2030 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.1570,r1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,20.9103,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,13.2784,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,10.8633,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.7163,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.9103,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.1465,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.8633,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.7609,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,20.9103,r1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,13.2784,r1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,10.8633,r1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,8.7163,r1,2,MUS$2010/PJ,2035 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.9103,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.1465,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.8633,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.7609,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.9103,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.6519,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.8633,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.0377,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,20.9103,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.0586,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.8633,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.4573,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,20.9103,r1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,18.0586,r1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,10.8633,r1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,10.4573,r1,6,MUS$2010/PJ,2035 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.2149,r1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,20.9103,r1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,18.0586,r1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,10.8633,r1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,10.4573,r1,7,MUS$2010/PJ,2035 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.2149,r1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,21.8320,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,12.7103,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.2320,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.8106,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,21.8320,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.8385,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.2320,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.9578,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,21.8320,r1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,12.7103,r1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,11.2320,r1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,7.8106,r1,2,MUS$2010/PJ,2040 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,21.8320,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.8385,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.2320,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.9578,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,21.8320,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,29.1648,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.2320,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.3600,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,21.8320,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.5906,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.2320,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.7227,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,21.8320,r1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,14.5906,r1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,11.2320,r1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,9.7227,r1,6,MUS$2010/PJ,2040 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.2728,r1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,21.8320,r1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,14.5906,r1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,11.2320,r1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,9.7227,r1,7,MUS$2010/PJ,2040 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.2728,r1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,23.0290,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.9372,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.7108,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.5833,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,23.0290,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.5385,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.7108,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.0346,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,23.0290,r1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,11.9372,r1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,11.7108,r1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,7.5833,r1,2,MUS$2010/PJ,2045 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,23.0290,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.5385,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.7108,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.0346,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,23.0290,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,34.2205,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.7108,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.1652,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,23.0290,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.9394,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.7108,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.3355,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,23.0290,r1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,12.9394,r1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,11.7108,r1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,8.3355,r1,6,MUS$2010/PJ,2045 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.3539,r1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,23.0290,r1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,12.9394,r1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,11.7108,r1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,8.3355,r1,7,MUS$2010/PJ,2045 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.3539,r1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,23.9599,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.5599,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.0832,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.2741,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,23.9599,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.9460,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.0832,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.5146,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,23.9599,r1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,11.5599,r1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,12.0832,r1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,7.2741,r1,2,MUS$2010/PJ,2050 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,23.9599,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.9460,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.0832,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.5146,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,23.9599,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,31.8173,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.0832,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.1874,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,23.9599,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.5490,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.0832,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.6750,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,23.9599,r1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,14.5490,r1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,12.0832,r1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,7.6750,r1,6,MUS$2010/PJ,2050 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.4351,r1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,23.9599,r1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,14.5490,r1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,12.0832,r1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,7.6750,r1,7,MUS$2010/PJ,2050 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.4351,r1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv index f718873b2..abd2f7605 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv @@ -23,195 +23,139 @@ CO2f,all-week,early-morning,all-year,r1,80.8875,6,MUS$2010/kt,2020 gas,all-week,late-afternoon,all-year,r1,1.4500,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,r1,1.2500,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,r1,80.8875,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1266,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,0.9270,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0827,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,51.5233,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.1808,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.3243,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,60.3960,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,1.5467,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.3333,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,73.6048,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,r1,0.1266,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,r1,0.9270,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,86.2800,1,MUS$2010/kt,2025 +gas,all-week,mid-afternoon,all-year,r1,1.0827,2,MUS$2010/PJ,2025 heat,all-week,mid-afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2025 -CO2f,all-week,mid-afternoon,all-year,r1,51.5233,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.1808,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.3243,3,MUS$2010/PJ,2025 +CO2f,all-week,mid-afternoon,all-year,r1,60.3960,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,1.5467,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.3333,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,73.6048,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.3797,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,2.7810,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,86.2800,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,3.2480,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,154.5700,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.2531,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,1.8540,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,181.1880,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,2.1653,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,103.0467,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,r1,0.2531,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,r1,1.8540,6,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,r1,120.7920,5,MUS$2010/kt,2025 +gas,all-week,early-morning,all-year,r1,2.1653,6,MUS$2010/PJ,2025 heat,all-week,early-morning,all-year,r1,1.8667,6,MUS$2010/PJ,2025 -CO2f,all-week,early-morning,all-year,r1,103.0467,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,r1,0.2531,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,r1,1.8540,7,MUS$2010/PJ,2025 +CO2f,all-week,early-morning,all-year,r1,120.7920,6,MUS$2010/kt,2025 +gas,all-week,late-afternoon,all-year,r1,2.1653,7,MUS$2010/PJ,2025 heat,all-week,late-afternoon,all-year,r1,1.8667,7,MUS$2010/PJ,2025 -CO2f,all-week,late-afternoon,all-year,r1,103.0467,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.3032,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7690,0,MUS$2010/PJ,2030 +CO2f,all-week,late-afternoon,all-year,r1,120.7920,7,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1266,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.9863,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.1667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,42.6351,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.4332,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.0986,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,55.0204,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.1808,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.4090,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.6667,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,60.9073,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,r1,0.3032,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,r1,0.7690,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,78.6005,1,MUS$2010/kt,2030 +electricity,all-week,mid-afternoon,all-year,r1,0.1266,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,r1,0.9863,2,MUS$2010/PJ,2030 heat,all-week,mid-afternoon,all-year,r1,1.1667,2,MUS$2010/PJ,2030 -CO2f,all-week,mid-afternoon,all-year,r1,42.6351,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.4332,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.0986,3,MUS$2010/PJ,2030 +CO2f,all-week,mid-afternoon,all-year,r1,55.0204,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.1808,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.4090,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.6667,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,60.9073,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.9097,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.3070,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,78.6005,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.3797,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.9589,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,3.5000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,127.9054,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.6065,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.5380,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,165.0611,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.2531,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.9726,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,2.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,85.2703,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,r1,0.6065,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,r1,1.5380,6,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,110.0407,5,MUS$2010/kt,2030 +electricity,all-week,early-morning,all-year,r1,0.2531,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,r1,1.9726,6,MUS$2010/PJ,2030 heat,all-week,early-morning,all-year,r1,2.3333,6,MUS$2010/PJ,2030 -CO2f,all-week,early-morning,all-year,r1,85.2703,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,r1,0.6065,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,r1,1.5380,7,MUS$2010/PJ,2030 +CO2f,all-week,early-morning,all-year,r1,110.0407,6,MUS$2010/kt,2030 +electricity,all-week,late-afternoon,all-year,r1,0.2531,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,r1,1.9726,7,MUS$2010/PJ,2030 heat,all-week,late-afternoon,all-year,r1,2.3333,7,MUS$2010/PJ,2030 -CO2f,all-week,late-afternoon,all-year,r1,85.2703,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.5600,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2950,0,MUS$2010/PJ,2035 +CO2f,all-week,late-afternoon,all-year,r1,110.0407,7,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.5099,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.1453,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,1.4000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,16.1950,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.8000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.4215,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,8.1056,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.7284,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.2076,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,23.1358,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,r1,0.5600,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,r1,0.2950,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,11.5794,1,MUS$2010/kt,2035 +electricity,all-week,mid-afternoon,all-year,r1,0.5099,2,MUS$2010/PJ,2035 +gas,all-week,mid-afternoon,all-year,r1,0.1453,2,MUS$2010/PJ,2035 heat,all-week,mid-afternoon,all-year,r1,1.4000,2,MUS$2010/PJ,2035 -CO2f,all-week,mid-afternoon,all-year,r1,16.1950,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.8000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.4215,3,MUS$2010/PJ,2035 +CO2f,all-week,mid-afternoon,all-year,r1,8.1056,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.7284,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.2076,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,23.1358,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.6800,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,11.5794,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,1.5297,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.4359,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,4.2000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.1200,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.5901,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,24.3168,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.0198,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.2906,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.8000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,32.3901,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,r1,1.1200,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,r1,0.5901,6,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,16.2112,5,MUS$2010/kt,2035 +electricity,all-week,early-morning,all-year,r1,1.0198,6,MUS$2010/PJ,2035 +gas,all-week,early-morning,all-year,r1,0.2906,6,MUS$2010/PJ,2035 heat,all-week,early-morning,all-year,r1,2.8000,6,MUS$2010/PJ,2035 -CO2f,all-week,early-morning,all-year,r1,32.3901,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,r1,1.1200,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,r1,0.5901,7,MUS$2010/PJ,2035 +CO2f,all-week,early-morning,all-year,r1,16.2112,6,MUS$2010/kt,2035 +electricity,all-week,late-afternoon,all-year,r1,1.0198,7,MUS$2010/PJ,2035 +gas,all-week,late-afternoon,all-year,r1,0.2906,7,MUS$2010/PJ,2035 heat,all-week,late-afternoon,all-year,r1,2.8000,7,MUS$2010/PJ,2035 -CO2f,all-week,late-afternoon,all-year,r1,32.3901,7,MUS$2010/kt,2035 +CO2f,all-week,late-afternoon,all-year,r1,16.2112,7,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.6533,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.2950,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,1.6333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,16.1950,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,0.9333,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.4215,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,2.3333,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,23.1358,1,MUS$2010/kt,2040 electricity,all-week,mid-afternoon,all-year,r1,0.6533,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,r1,0.2950,2,MUS$2010/PJ,2040 heat,all-week,mid-afternoon,all-year,r1,1.6333,2,MUS$2010/PJ,2040 -CO2f,all-week,mid-afternoon,all-year,r1,16.1950,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,0.9333,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.4215,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,2.3333,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,23.1358,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,1.9600,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,4.9000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.3067,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.5901,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,3.2667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,32.3901,5,MUS$2010/kt,2040 electricity,all-week,early-morning,all-year,r1,1.3067,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,r1,0.5901,6,MUS$2010/PJ,2040 heat,all-week,early-morning,all-year,r1,3.2667,6,MUS$2010/PJ,2040 -CO2f,all-week,early-morning,all-year,r1,32.3901,6,MUS$2010/kt,2040 electricity,all-week,late-afternoon,all-year,r1,1.3067,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,r1,0.5901,7,MUS$2010/PJ,2040 heat,all-week,late-afternoon,all-year,r1,3.2667,7,MUS$2010/PJ,2040 -CO2f,all-week,late-afternoon,all-year,r1,32.3901,7,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,0.7467,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.2950,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,1.8667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,16.1950,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,1.0667,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.4215,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,2.6667,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,23.1358,1,MUS$2010/kt,2045 electricity,all-week,mid-afternoon,all-year,r1,0.7467,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,r1,0.2950,2,MUS$2010/PJ,2045 heat,all-week,mid-afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2045 -CO2f,all-week,mid-afternoon,all-year,r1,16.1950,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,1.0667,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.4215,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,2.6667,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,23.1358,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,2.2400,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,1.4933,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.5901,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,32.3901,5,MUS$2010/kt,2045 electricity,all-week,early-morning,all-year,r1,1.4933,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,r1,0.5901,6,MUS$2010/PJ,2045 heat,all-week,early-morning,all-year,r1,3.7333,6,MUS$2010/PJ,2045 -CO2f,all-week,early-morning,all-year,r1,32.3901,6,MUS$2010/kt,2045 electricity,all-week,late-afternoon,all-year,r1,1.4933,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,r1,0.5901,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,r1,3.7333,7,MUS$2010/PJ,2045 -CO2f,all-week,late-afternoon,all-year,r1,32.3901,7,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,0.8400,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.2950,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,2.1000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,16.1950,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.4215,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,23.1358,1,MUS$2010/kt,2050 electricity,all-week,mid-afternoon,all-year,r1,0.8400,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,r1,0.2950,2,MUS$2010/PJ,2050 heat,all-week,mid-afternoon,all-year,r1,2.1000,2,MUS$2010/PJ,2050 -CO2f,all-week,mid-afternoon,all-year,r1,16.1950,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.4215,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,23.1358,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,2.5200,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,6.3000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,1.6800,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.5901,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,4.2000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,32.3901,5,MUS$2010/kt,2050 electricity,all-week,early-morning,all-year,r1,1.6800,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,r1,0.5901,6,MUS$2010/PJ,2050 heat,all-week,early-morning,all-year,r1,4.2000,6,MUS$2010/PJ,2050 -CO2f,all-week,early-morning,all-year,r1,32.3901,6,MUS$2010/kt,2050 electricity,all-week,late-afternoon,all-year,r1,1.6800,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,r1,0.5901,7,MUS$2010/PJ,2050 heat,all-week,late-afternoon,all-year,r1,4.2000,7,MUS$2010/PJ,2050 -CO2f,all-week,late-afternoon,all-year,r1,32.3901,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml index 3fb79158e..def70b9a7 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml @@ -34,6 +34,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -45,6 +46,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -56,6 +58,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 4526361d9..c13ac84b7 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 @@ -159,203 +159,203 @@ gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2026 heat,all-week,late-afternoon,all-year,12.2767,r1,7,MUS$2010/PJ,2026 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.1275,r1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,22.0420,r1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,20.1556,r1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,13.0652,r1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,12.9993,r1,0,MUS$2010/PJ,2028 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.1422,r1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,22.0420,r1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,21.0536,r1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,13.0652,r1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,13.0307,r1,1,MUS$2010/PJ,2028 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.1422,r1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,22.0420,r1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,20.1556,r1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,13.0652,r1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,12.9993,r1,2,MUS$2010/PJ,2028 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.1422,r1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,22.0420,r1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,21.0536,r1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,13.0652,r1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,13.0307,r1,3,MUS$2010/PJ,2028 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.1422,r1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,22.0420,r1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,23.5233,r1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,13.0652,r1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,13.1170,r1,4,MUS$2010/PJ,2028 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.1422,r1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,22.0420,r1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,22.4007,r1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,13.0652,r1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,13.0777,r1,5,MUS$2010/PJ,2028 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.1422,r1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,22.0420,r1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,22.4007,r1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,13.0652,r1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,13.0777,r1,6,MUS$2010/PJ,2028 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.1422,r1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,22.0420,r1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,22.4007,r1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,13.0652,r1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,13.0777,r1,7,MUS$2010/PJ,2028 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.1422,r1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,20.6953,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.5841,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.5717,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.6360,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.6953,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.8163,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.5717,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.6528,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,20.6953,r1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,21.5841,r1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,13.5717,r1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,13.6360,r1,2,MUS$2010/PJ,2030 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.6953,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.8163,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.5717,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.6528,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,20.6953,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,32.4804,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.5717,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.4240,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,20.6953,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,25.8637,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.5717,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.9455,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,20.6953,r1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,25.8637,r1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,13.5717,r1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,13.9455,r1,6,MUS$2010/PJ,2030 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.1570,r1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,20.6953,r1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,25.8637,r1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,13.5717,r1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,13.9455,r1,7,MUS$2010/PJ,2030 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.1570,r1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.8744,r1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,23.7425,r1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,14.0151,r1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,14.2965,r1,0,MUS$2010/PJ,2032 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.1802,r1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,21.8744,r1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,23.9393,r1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,14.0151,r1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,14.3262,r1,1,MUS$2010/PJ,2032 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.1802,r1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,21.8744,r1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,23.7425,r1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,14.0151,r1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,14.2965,r1,2,MUS$2010/PJ,2032 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.1802,r1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,21.8744,r1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,23.9393,r1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,14.0151,r1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,14.3262,r1,3,MUS$2010/PJ,2032 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.1802,r1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,21.8744,r1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,38.9688,r1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,14.0151,r1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,16.5907,r1,4,MUS$2010/PJ,2032 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.1802,r1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,21.8744,r1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,24.9653,r1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,14.0151,r1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,14.4808,r1,5,MUS$2010/PJ,2032 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.1802,r1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,21.8744,r1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,24.9653,r1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,14.0151,r1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,14.4808,r1,6,MUS$2010/PJ,2032 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.1802,r1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,21.8744,r1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,24.9653,r1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,14.0151,r1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,14.4808,r1,7,MUS$2010/PJ,2032 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.1802,r1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,21.0620,r1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,25.6744,r1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,13.7401,r1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,14.7552,r1,0,MUS$2010/PJ,2034 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.2033,r1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,21.0620,r1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,22.8550,r1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,13.7401,r1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,14.1347,r1,1,MUS$2010/PJ,2034 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.2033,r1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,21.0620,r1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,25.6744,r1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,13.7401,r1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,14.7552,r1,2,MUS$2010/PJ,2034 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.2033,r1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,21.0620,r1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,22.8550,r1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,13.7401,r1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,14.1347,r1,3,MUS$2010/PJ,2034 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.2033,r1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,21.0620,r1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,38.2894,r1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,13.7401,r1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,17.5315,r1,4,MUS$2010/PJ,2034 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.2033,r1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,21.0620,r1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,23.4209,r1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,13.7401,r1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,14.2592,r1,5,MUS$2010/PJ,2034 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.2033,r1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,21.0620,r1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,23.4209,r1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,13.7401,r1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,14.2592,r1,6,MUS$2010/PJ,2034 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.2033,r1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,21.0620,r1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,23.4209,r1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,13.7401,r1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,14.2592,r1,7,MUS$2010/PJ,2034 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.2033,r1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,20.6308,r1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,24.3238,r1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,13.1203,r1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,14.1563,r1,0,MUS$2010/PJ,2036 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.2265,r1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,20.6308,r1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,20.9410,r1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,13.1203,r1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,13.2073,r1,1,MUS$2010/PJ,2036 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.2265,r1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,20.6308,r1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,24.3238,r1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,13.1203,r1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,14.1563,r1,2,MUS$2010/PJ,2036 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.2265,r1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,20.6308,r1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,20.9410,r1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,13.1203,r1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,13.2073,r1,3,MUS$2010/PJ,2036 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.2265,r1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,20.6308,r1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,37.6219,r1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,13.1203,r1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,17.8869,r1,4,MUS$2010/PJ,2036 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.2265,r1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,20.6308,r1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,22.0108,r1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,13.1203,r1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,13.5074,r1,5,MUS$2010/PJ,2036 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.2265,r1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,20.6308,r1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,22.0108,r1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,13.1203,r1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,13.5074,r1,6,MUS$2010/PJ,2036 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.2265,r1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,20.6308,r1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,22.0108,r1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,13.1203,r1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,13.5074,r1,7,MUS$2010/PJ,2036 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.2265,r1,7,MUS$2010/kt,2036 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv index 66a3b9e52..2f1846078 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv @@ -128,130 +128,130 @@ gas,all-week,late-afternoon,all-year,r1,2.3979,7,MUS$2010/PJ,2028 heat,all-week,late-afternoon,all-year,r1,2.1467,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,r1,133.6529,7,MUS$2010/kt,2028 electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.1869,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.2496,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.1667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,66.1423,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,69.5799,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,r1,0.1205,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.6956,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.7851,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.6667,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,94.4890,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,99.3998,1,MUS$2010/kt,2030 electricity,all-week,mid-afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,r1,1.1869,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,r1,1.2496,2,MUS$2010/PJ,2030 heat,all-week,mid-afternoon,all-year,r1,1.1667,2,MUS$2010/PJ,2030 -CO2f,all-week,mid-afternoon,all-year,r1,66.1423,2,MUS$2010/kt,2030 +CO2f,all-week,mid-afternoon,all-year,r1,69.5799,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,r1,0.1205,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.6956,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.7851,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.6667,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,94.4890,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,99.3998,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,r1,3.5608,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,3.5000,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,r1,198.4268,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.3739,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.4521,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,2.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,132.2845,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,136.5816,5,MUS$2010/kt,2030 electricity,all-week,early-morning,all-year,r1,0.1688,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,r1,2.3739,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,r1,2.4521,6,MUS$2010/PJ,2030 heat,all-week,early-morning,all-year,r1,2.3333,6,MUS$2010/PJ,2030 -CO2f,all-week,early-morning,all-year,r1,132.2845,6,MUS$2010/kt,2030 +CO2f,all-week,early-morning,all-year,r1,136.5816,6,MUS$2010/kt,2030 electricity,all-week,late-afternoon,all-year,r1,0.1688,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,r1,2.3739,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,r1,2.4521,7,MUS$2010/PJ,2030 heat,all-week,late-afternoon,all-year,r1,2.3333,7,MUS$2010/PJ,2030 -CO2f,all-week,late-afternoon,all-year,r1,132.2845,7,MUS$2010/kt,2030 +CO2f,all-week,late-afternoon,all-year,r1,136.5816,7,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.1898,0,MUS$2010/PJ,2032 -gas,all-week,night,all-year,r1,1.0872,0,MUS$2010/PJ,2032 +gas,all-week,night,all-year,r1,1.2281,0,MUS$2010/PJ,2032 heat,all-week,night,all-year,r1,1.2600,0,MUS$2010/PJ,2032 -CO2f,all-week,night,all-year,r1,60.4909,0,MUS$2010/kt,2032 +CO2f,all-week,night,all-year,r1,68.2256,0,MUS$2010/kt,2032 electricity,all-week,morning,all-year,r1,0.2712,1,MUS$2010/PJ,2032 -gas,all-week,morning,all-year,r1,1.5531,1,MUS$2010/PJ,2032 +gas,all-week,morning,all-year,r1,1.7544,1,MUS$2010/PJ,2032 heat,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2032 -CO2f,all-week,morning,all-year,r1,86.4156,1,MUS$2010/kt,2032 +CO2f,all-week,morning,all-year,r1,97.4651,1,MUS$2010/kt,2032 electricity,all-week,mid-afternoon,all-year,r1,0.1898,2,MUS$2010/PJ,2032 -gas,all-week,mid-afternoon,all-year,r1,1.0872,2,MUS$2010/PJ,2032 +gas,all-week,mid-afternoon,all-year,r1,1.2281,2,MUS$2010/PJ,2032 heat,all-week,mid-afternoon,all-year,r1,1.2600,2,MUS$2010/PJ,2032 -CO2f,all-week,mid-afternoon,all-year,r1,60.4909,2,MUS$2010/kt,2032 +CO2f,all-week,mid-afternoon,all-year,r1,68.2256,2,MUS$2010/kt,2032 electricity,all-week,early-peak,all-year,r1,0.2712,3,MUS$2010/PJ,2032 -gas,all-week,early-peak,all-year,r1,1.5531,3,MUS$2010/PJ,2032 +gas,all-week,early-peak,all-year,r1,1.7544,3,MUS$2010/PJ,2032 heat,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2032 -CO2f,all-week,early-peak,all-year,r1,86.4156,3,MUS$2010/kt,2032 +CO2f,all-week,early-peak,all-year,r1,97.4651,3,MUS$2010/kt,2032 electricity,all-week,late-peak,all-year,r1,0.5695,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,r1,3.2616,4,MUS$2010/PJ,2032 heat,all-week,late-peak,all-year,r1,3.7800,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,r1,181.4728,4,MUS$2010/kt,2032 electricity,all-week,evening,all-year,r1,0.3797,5,MUS$2010/PJ,2032 -gas,all-week,evening,all-year,r1,2.1744,5,MUS$2010/PJ,2032 +gas,all-week,evening,all-year,r1,2.3505,5,MUS$2010/PJ,2032 heat,all-week,evening,all-year,r1,2.5200,5,MUS$2010/PJ,2032 -CO2f,all-week,evening,all-year,r1,120.9819,5,MUS$2010/kt,2032 +CO2f,all-week,evening,all-year,r1,130.6502,5,MUS$2010/kt,2032 electricity,all-week,early-morning,all-year,r1,0.3797,6,MUS$2010/PJ,2032 -gas,all-week,early-morning,all-year,r1,2.1744,6,MUS$2010/PJ,2032 +gas,all-week,early-morning,all-year,r1,2.3505,6,MUS$2010/PJ,2032 heat,all-week,early-morning,all-year,r1,2.5200,6,MUS$2010/PJ,2032 -CO2f,all-week,early-morning,all-year,r1,120.9819,6,MUS$2010/kt,2032 +CO2f,all-week,early-morning,all-year,r1,130.6502,6,MUS$2010/kt,2032 electricity,all-week,late-afternoon,all-year,r1,0.3797,7,MUS$2010/PJ,2032 -gas,all-week,late-afternoon,all-year,r1,2.1744,7,MUS$2010/PJ,2032 +gas,all-week,late-afternoon,all-year,r1,2.3505,7,MUS$2010/PJ,2032 heat,all-week,late-afternoon,all-year,r1,2.5200,7,MUS$2010/PJ,2032 -CO2f,all-week,late-afternoon,all-year,r1,120.9819,7,MUS$2010/kt,2032 +CO2f,all-week,late-afternoon,all-year,r1,130.6502,7,MUS$2010/kt,2032 electricity,all-week,night,all-year,r1,0.2978,0,MUS$2010/PJ,2034 -gas,all-week,night,all-year,r1,0.8865,0,MUS$2010/PJ,2034 +gas,all-week,night,all-year,r1,1.2035,0,MUS$2010/PJ,2034 heat,all-week,night,all-year,r1,1.3533,0,MUS$2010/PJ,2034 -CO2f,all-week,night,all-year,r1,49.2909,0,MUS$2010/kt,2034 +CO2f,all-week,night,all-year,r1,66.6939,0,MUS$2010/kt,2034 electricity,all-week,morning,all-year,r1,0.4255,1,MUS$2010/PJ,2034 -gas,all-week,morning,all-year,r1,1.2664,1,MUS$2010/PJ,2034 +gas,all-week,morning,all-year,r1,1.5498,1,MUS$2010/PJ,2034 heat,all-week,morning,all-year,r1,1.9333,1,MUS$2010/PJ,2034 -CO2f,all-week,morning,all-year,r1,70.4156,1,MUS$2010/kt,2034 +CO2f,all-week,morning,all-year,r1,85.9733,1,MUS$2010/kt,2034 electricity,all-week,mid-afternoon,all-year,r1,0.2978,2,MUS$2010/PJ,2034 -gas,all-week,mid-afternoon,all-year,r1,0.8865,2,MUS$2010/PJ,2034 +gas,all-week,mid-afternoon,all-year,r1,1.2035,2,MUS$2010/PJ,2034 heat,all-week,mid-afternoon,all-year,r1,1.3533,2,MUS$2010/PJ,2034 -CO2f,all-week,mid-afternoon,all-year,r1,49.2909,2,MUS$2010/kt,2034 +CO2f,all-week,mid-afternoon,all-year,r1,66.6939,2,MUS$2010/kt,2034 electricity,all-week,early-peak,all-year,r1,0.4255,3,MUS$2010/PJ,2034 -gas,all-week,early-peak,all-year,r1,1.2664,3,MUS$2010/PJ,2034 +gas,all-week,early-peak,all-year,r1,1.5498,3,MUS$2010/PJ,2034 heat,all-week,early-peak,all-year,r1,1.9333,3,MUS$2010/PJ,2034 -CO2f,all-week,early-peak,all-year,r1,70.4156,3,MUS$2010/kt,2034 +CO2f,all-week,early-peak,all-year,r1,85.9733,3,MUS$2010/kt,2034 electricity,all-week,late-peak,all-year,r1,0.8935,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,r1,2.6594,4,MUS$2010/PJ,2034 heat,all-week,late-peak,all-year,r1,4.0600,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,r1,147.8727,4,MUS$2010/kt,2034 electricity,all-week,evening,all-year,r1,0.5957,5,MUS$2010/PJ,2034 -gas,all-week,evening,all-year,r1,1.7730,5,MUS$2010/PJ,2034 +gas,all-week,evening,all-year,r1,1.9533,5,MUS$2010/PJ,2034 heat,all-week,evening,all-year,r1,2.7067,5,MUS$2010/PJ,2034 -CO2f,all-week,evening,all-year,r1,98.5818,5,MUS$2010/kt,2034 +CO2f,all-week,evening,all-year,r1,108.4821,5,MUS$2010/kt,2034 electricity,all-week,early-morning,all-year,r1,0.5957,6,MUS$2010/PJ,2034 -gas,all-week,early-morning,all-year,r1,1.7730,6,MUS$2010/PJ,2034 +gas,all-week,early-morning,all-year,r1,1.9533,6,MUS$2010/PJ,2034 heat,all-week,early-morning,all-year,r1,2.7067,6,MUS$2010/PJ,2034 -CO2f,all-week,early-morning,all-year,r1,98.5818,6,MUS$2010/kt,2034 +CO2f,all-week,early-morning,all-year,r1,108.4821,6,MUS$2010/kt,2034 electricity,all-week,late-afternoon,all-year,r1,0.5957,7,MUS$2010/PJ,2034 -gas,all-week,late-afternoon,all-year,r1,1.7730,7,MUS$2010/PJ,2034 +gas,all-week,late-afternoon,all-year,r1,1.9533,7,MUS$2010/PJ,2034 heat,all-week,late-afternoon,all-year,r1,2.7067,7,MUS$2010/PJ,2034 -CO2f,all-week,late-afternoon,all-year,r1,98.5818,7,MUS$2010/kt,2034 +CO2f,all-week,late-afternoon,all-year,r1,108.4821,7,MUS$2010/kt,2034 electricity,all-week,night,all-year,r1,0.4058,0,MUS$2010/PJ,2036 -gas,all-week,night,all-year,r1,0.6815,0,MUS$2010/PJ,2036 +gas,all-week,night,all-year,r1,1.0423,0,MUS$2010/PJ,2036 heat,all-week,night,all-year,r1,1.4467,0,MUS$2010/PJ,2036 -CO2f,all-week,night,all-year,r1,37.8588,0,MUS$2010/kt,2036 +CO2f,all-week,night,all-year,r1,57.6595,0,MUS$2010/kt,2036 electricity,all-week,morning,all-year,r1,0.5798,1,MUS$2010/PJ,2036 -gas,all-week,morning,all-year,r1,0.9736,1,MUS$2010/PJ,2036 +gas,all-week,morning,all-year,r1,1.2571,1,MUS$2010/PJ,2036 heat,all-week,morning,all-year,r1,2.0667,1,MUS$2010/PJ,2036 -CO2f,all-week,morning,all-year,r1,54.0840,1,MUS$2010/kt,2036 +CO2f,all-week,morning,all-year,r1,69.6417,1,MUS$2010/kt,2036 electricity,all-week,mid-afternoon,all-year,r1,0.4058,2,MUS$2010/PJ,2036 -gas,all-week,mid-afternoon,all-year,r1,0.6815,2,MUS$2010/PJ,2036 +gas,all-week,mid-afternoon,all-year,r1,1.0423,2,MUS$2010/PJ,2036 heat,all-week,mid-afternoon,all-year,r1,1.4467,2,MUS$2010/PJ,2036 -CO2f,all-week,mid-afternoon,all-year,r1,37.8588,2,MUS$2010/kt,2036 +CO2f,all-week,mid-afternoon,all-year,r1,57.6595,2,MUS$2010/kt,2036 electricity,all-week,early-peak,all-year,r1,0.5798,3,MUS$2010/PJ,2036 -gas,all-week,early-peak,all-year,r1,0.9736,3,MUS$2010/PJ,2036 +gas,all-week,early-peak,all-year,r1,1.2571,3,MUS$2010/PJ,2036 heat,all-week,early-peak,all-year,r1,2.0667,3,MUS$2010/PJ,2036 -CO2f,all-week,early-peak,all-year,r1,54.0840,3,MUS$2010/kt,2036 +CO2f,all-week,early-peak,all-year,r1,69.6417,3,MUS$2010/kt,2036 electricity,all-week,late-peak,all-year,r1,1.2175,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,r1,2.0446,4,MUS$2010/PJ,2036 heat,all-week,late-peak,all-year,r1,4.3400,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,r1,113.5764,4,MUS$2010/kt,2036 electricity,all-week,evening,all-year,r1,0.8117,5,MUS$2010/PJ,2036 -gas,all-week,evening,all-year,r1,1.3631,5,MUS$2010/PJ,2036 +gas,all-week,evening,all-year,r1,1.5435,5,MUS$2010/PJ,2036 heat,all-week,evening,all-year,r1,2.8933,5,MUS$2010/PJ,2036 -CO2f,all-week,evening,all-year,r1,75.7176,5,MUS$2010/kt,2036 +CO2f,all-week,evening,all-year,r1,85.6179,5,MUS$2010/kt,2036 electricity,all-week,early-morning,all-year,r1,0.8117,6,MUS$2010/PJ,2036 -gas,all-week,early-morning,all-year,r1,1.3631,6,MUS$2010/PJ,2036 +gas,all-week,early-morning,all-year,r1,1.5435,6,MUS$2010/PJ,2036 heat,all-week,early-morning,all-year,r1,2.8933,6,MUS$2010/PJ,2036 -CO2f,all-week,early-morning,all-year,r1,75.7176,6,MUS$2010/kt,2036 +CO2f,all-week,early-morning,all-year,r1,85.6179,6,MUS$2010/kt,2036 electricity,all-week,late-afternoon,all-year,r1,0.8117,7,MUS$2010/PJ,2036 -gas,all-week,late-afternoon,all-year,r1,1.3631,7,MUS$2010/PJ,2036 +gas,all-week,late-afternoon,all-year,r1,1.5435,7,MUS$2010/PJ,2036 heat,all-week,late-afternoon,all-year,r1,2.8933,7,MUS$2010/PJ,2036 -CO2f,all-week,late-afternoon,all-year,r1,75.7176,7,MUS$2010/kt,2036 +CO2f,all-week,late-afternoon,all-year,r1,85.6179,7,MUS$2010/kt,2036 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml index 01bda8a97..c0bbc6b87 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml @@ -34,6 +34,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.residential] type = 'default' priority = 1 +dispatch_production = "share" technodata = '{path}/residential/Technodata.csv' commodities_in = '{path}/residential/CommIn.csv' commodities_out = '{path}/residential/CommOut.csv' @@ -45,6 +46,7 @@ existing_capacity = '{path}/residential/ExistingCapacity.csv' [sectors.power] type = 'default' priority = 2 +dispatch_production = "merit-order" technodata = '{path}/power/Technodata.csv' commodities_in = '{path}/power/CommIn.csv' commodities_out = '{path}/power/CommOut.csv' @@ -56,6 +58,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 +dispatch_production = "merit-order" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' From 3fd29c88bd5d80ae98373630860c2db709f453a1 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 17:48:23 +0100 Subject: [PATCH 10/41] Fix for models with multiple regions Co-authored-by: Copilot --- .../1-new-region/Results/MCACapacity.csv | 67 ++-- .../1-new-region/Results/MCAPrices.csv | 316 +++++++-------- .../1-new-region/Results/MCASupply.csv | 360 ++++++++---------- src/muse/dispatch.py | 59 +-- 4 files changed, 374 insertions(+), 428 deletions(-) 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 6818377eb..0c5a0634c 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 @@ -14,11 +14,11 @@ A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2025 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2025 +A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2025 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2025 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2025 A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 @@ -28,15 +28,14 @@ A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2030 A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2030 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2030 -A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2030 +A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2030 +A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,7.5000,r2,2020,r2,gas,gassupply1,newcapa,2030 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2030 -A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2030 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2030 +A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2030 A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 A1,16.0000,r2,2035,r2,residential,gasboiler,newcapa,2035 @@ -46,14 +45,13 @@ A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2035 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2035 -A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2035 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2035 +A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2035 +A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2035 +A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2035 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2035 -A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2035 +A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2035 +A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2035 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 @@ -66,14 +64,13 @@ A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2040 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2040 -A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2040 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2040 +A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2040 +A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2040 +A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2040 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2040 -A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2040 +A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2040 +A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2040 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2040 A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 @@ -88,14 +85,13 @@ A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2045 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2045 -A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2045 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2045 +A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2045 +A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2045 +A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2045 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2045 -A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2045 +A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2045 +A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2045 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2045 A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2045 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2045 @@ -112,14 +108,13 @@ A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2050 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2050 -A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2050 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2050 +A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2050 +A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2050 +A1,5.3437,r2,2050,r2,power,windturbine,newcapa,2050 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2050 -A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2050 +A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2050 +A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2050 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 44ca78544..754310ea1 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 @@ -59,363 +59,363 @@ gas,all-week,evening,all-year,7.1528,r2,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,night,all-year,20.1973,r2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.4724,r2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,8.1065,r2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,17.3700,r2,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.1973,r2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4724,r2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,8.1065,r2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,17.3700,r2,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,20.1973,r2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.4724,r2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,8.1065,r2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,17.3700,r2,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.1973,r2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4724,r2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,8.1065,r2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,17.3700,r2,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1973,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,20.1973,r2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.4724,r2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,8.1065,r2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,17.3700,r2,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.1973,r2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.4724,r2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,8.1065,r2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,17.3700,r2,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,21.3025,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,22.0164,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.3017,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.4787,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.3025,r2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.3017,r2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,9.0602,r2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,17.8205,r2,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,21.3025,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,23.3215,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.3017,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.8022,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,21.3025,r2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.3017,r2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,9.0602,r2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,17.8205,r2,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,21.3025,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,22.0164,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.3017,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.4787,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,21.3025,r2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.3017,r2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,9.0602,r2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,17.8205,r2,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,21.3025,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,23.3215,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.3017,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.8022,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,21.3025,r2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.3017,r2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,9.0602,r2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,17.8205,r2,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.3025,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,32.1823,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.3017,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.9990,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.3025,r2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.3017,r2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,9.0602,r2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,17.8205,r2,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,21.3025,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,26.6772,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.3017,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.6342,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,21.3025,r2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.3017,r2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,9.0602,r2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,17.8205,r2,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.3268,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,27.4546,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.1281,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.5793,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,night,all-year,23.9885,r2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.7631,r2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,9.2191,r2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.9776,r2,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.3268,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,28.4757,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.1281,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.9877,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,23.9885,r2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.7631,r2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,16.5393,r2,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.3268,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,27.4546,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.1281,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.5793,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,23.9885,r2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.7631,r2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,9.2191,r2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.9776,r2,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.3268,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,28.4757,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.1281,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.9877,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,23.9885,r2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.7631,r2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,16.5393,r2,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.3268,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,38.1823,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.1281,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,17.8703,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,23.9885,r2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.7631,r2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,16.5393,r2,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.3268,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,33.8312,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.1281,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,16.1299,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,23.9885,r2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.7631,r2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,16.5393,r2,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,22.2411,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,32.7604,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,11.4939,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.7016,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,night,all-year,26.9066,r2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,17.7397,r2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,18.7064,r2,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,22.2411,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,33.6344,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.4939,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.0512,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,26.9066,r2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,17.7397,r2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,18.7064,r2,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,22.2411,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,32.7604,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,11.4939,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.7016,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,26.9066,r2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,17.7397,r2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,18.7064,r2,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,22.2411,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,33.6344,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.4939,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.0512,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,26.9066,r2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,17.7397,r2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,18.7064,r2,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.2411,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,38.3552,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.4939,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.9395,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,26.9066,r2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.7397,r2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,18.7064,r2,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,22.2411,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,33.7672,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,11.4939,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.1043,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,26.9066,r2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,17.7397,r2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,18.7064,r2,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,23.4166,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,40.2032,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,11.9641,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.6787,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,night,all-year,31.0002,r2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,21.9845,r2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.1480,r2,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,23.4166,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.5625,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.9641,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,16.8224,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,31.0002,r2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,21.9845,r2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.1480,r2,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,23.4166,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,40.2032,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,11.9641,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.6787,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,31.0002,r2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,21.9845,r2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.1480,r2,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,23.4166,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.5625,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.9641,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,16.8224,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,31.0002,r2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,21.9845,r2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.1480,r2,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,23.4166,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,40.9897,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.9641,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.9933,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,31.0002,r2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,21.9845,r2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.1480,r2,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,23.4166,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,33.3896,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.9641,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,15.9533,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,31.0002,r2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.9845,r2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.1480,r2,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,24.3309,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,47.7883,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.3298,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.7127,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,night,all-year,35.0937,r2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,26.4534,r2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,25.9924,r2,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,24.3309,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,47.7883,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.3298,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.7127,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,35.0937,r2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,26.4534,r2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,25.9924,r2,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,24.3309,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,47.7883,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,12.3298,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.7127,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,35.0937,r2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,26.4534,r2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,25.9924,r2,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,24.3309,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,47.7883,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.3298,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.7127,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,35.0937,r2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,26.4534,r2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,25.9924,r2,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,24.3309,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,55.6173,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.3298,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,24.8443,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,35.0937,r2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,26.4534,r2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,25.9924,r2,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,24.3309,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,47.8436,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.3298,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.7349,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,35.0937,r2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,26.4534,r2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,25.9924,r2,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv index faab6d73a..20dc72bd2 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv @@ -2,324 +2,268 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year gas,all-week,night,all-year,r1,1.1600,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,r1,1.0000,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,r1,64.7100,0,MUS$2010/kt,2020 -gas,all-week,night,all-year,r2,1.1600,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,r2,1.0000,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,r2,64.7100,0,MUS$2010/kt,2020 gas,all-week,morning,all-year,r1,1.7400,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,r1,1.5000,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,r1,97.0650,1,MUS$2010/kt,2020 -gas,all-week,morning,all-year,r2,1.7400,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,r2,1.5000,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,r2,97.0650,1,MUS$2010/kt,2020 gas,all-week,afternoon,all-year,r1,1.1600,2,MUS$2010/PJ,2020 heat,all-week,afternoon,all-year,r1,1.0000,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,r1,64.7100,2,MUS$2010/kt,2020 -gas,all-week,afternoon,all-year,r2,1.1600,2,MUS$2010/PJ,2020 heat,all-week,afternoon,all-year,r2,1.0000,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,r2,64.7100,2,MUS$2010/kt,2020 gas,all-week,early-peak,all-year,r1,1.7400,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,r1,1.5000,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,r1,97.0650,3,MUS$2010/kt,2020 -gas,all-week,early-peak,all-year,r2,1.7400,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,r2,1.5000,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,r2,97.0650,3,MUS$2010/kt,2020 gas,all-week,late-peak,all-year,r1,1.9333,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,r1,1.6667,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 -gas,all-week,late-peak,all-year,r2,1.9333,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,r2,1.6667,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,r2,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,evening,all-year,r2,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r2,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r2,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r2,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r2,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r2,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r2,74.4498,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r2,58.9805,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r2,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r2,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r2,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r2,111.6747,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r2,88.4707,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r2,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r2,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r2,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r2,74.4498,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r2,58.9805,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r2,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r2,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r2,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r2,111.6747,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r2,88.4707,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,3.1719,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r2,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r2,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r2,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r2,223.3493,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r2,176.9414,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r2,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r2,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r2,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r2,148.8996,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r2,117.9609,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.1433,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,63.4137,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r2,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r2,1.1433,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,78.8830,0,MUS$2010/kt,2030 heat,all-week,night,all-year,r2,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r2,63.4137,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r2,41.0055,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.7149,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,95.1205,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r2,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r2,1.7149,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,118.3245,1,MUS$2010/kt,2030 heat,all-week,morning,all-year,r2,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r2,95.1205,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r2,61.5082,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.1433,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,63.4137,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r2,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r2,1.1433,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,78.8830,2,MUS$2010/kt,2030 heat,all-week,afternoon,all-year,r2,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r2,63.4137,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r2,41.0055,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.7149,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,95.1205,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r2,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r2,1.7149,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,118.3245,3,MUS$2010/kt,2030 heat,all-week,early-peak,all-year,r2,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r2,95.1205,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r2,61.5082,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.7458,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r2,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r2,3.4299,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,236.6490,4,MUS$2010/kt,2030 heat,all-week,late-peak,all-year,r2,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r2,190.2411,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.2866,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r2,123.0164,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.9194,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,126.8274,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r2,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r2,2.2866,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,157.7660,5,MUS$2010/kt,2030 heat,all-week,evening,all-year,r2,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r2,126.8274,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r2,82.0109,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.0311,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2035 -electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r2,1.4393,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2035 heat,all-week,night,all-year,r2,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r2,79.9282,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r2,57.5200,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r2,2.1590,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2035 +gas,all-week,morning,all-year,r2,0.4665,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r2,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r2,119.8923,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r2,86.2800,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.0311,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r2,1.4393,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2035 heat,all-week,afternoon,all-year,r2,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r2,79.9282,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r2,57.5200,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r2,2.1590,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2035 +gas,all-week,early-peak,all-year,r2,0.4665,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r2,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r2,119.8923,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r2,86.2800,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.4938,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r2,4.3180,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2035 +gas,all-week,late-peak,all-year,r2,2.0131,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r2,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r2,239.7847,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r2,172.5600,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.2493,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r2,2.8787,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2035 +gas,all-week,evening,all-year,r2,0.9820,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r2,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r2,159.8564,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,r2,115.0400,5,MUS$2010/kt,2035 +electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2040 -electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r2,1.8260,0,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2040 +gas,all-week,night,all-year,r2,0.3376,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r2,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r2,101.4982,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,r2,79.0900,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,r1,0.8271,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r2,2.7390,1,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2040 +gas,all-week,morning,all-year,r2,1.0465,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r2,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r2,152.2473,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,r2,118.6350,1,MUS$2010/kt,2040 +electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r2,1.8260,2,MUS$2010/PJ,2040 +CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2040 +gas,all-week,afternoon,all-year,r2,0.3376,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r2,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r2,101.4982,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2040 +CO2f,all-week,afternoon,all-year,r2,79.0900,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,r1,0.8271,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r2,2.7390,3,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2040 +gas,all-week,early-peak,all-year,r2,1.0465,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r2,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r2,152.2473,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,r2,118.6350,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,r1,2.8938,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r2,5.4780,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2040 +gas,all-week,late-peak,all-year,r2,3.1731,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r2,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r2,304.4947,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r2,237.2700,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,r1,1.5160,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r2,3.6520,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2040 +gas,all-week,evening,all-year,r2,1.7553,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r2,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r2,202.9964,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2045 +CO2f,all-week,evening,all-year,r2,158.1800,5,MUS$2010/kt,2040 +electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2045 -electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r2,2.2127,0,MUS$2010/PJ,2045 +CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2045 +gas,all-week,night,all-year,r2,0.7242,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r2,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r2,123.0682,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2045 +CO2f,all-week,night,all-year,r2,100.6600,0,MUS$2010/kt,2045 +electricity,all-week,morning,all-year,r1,1.0271,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r2,3.3190,1,MUS$2010/PJ,2045 +CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2045 +gas,all-week,morning,all-year,r2,1.6265,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r2,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r2,184.6023,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2045 +CO2f,all-week,morning,all-year,r2,150.9900,1,MUS$2010/kt,2045 +electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r2,2.2127,2,MUS$2010/PJ,2045 +CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2045 +gas,all-week,afternoon,all-year,r2,0.7242,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r2,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r2,123.0682,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2045 +CO2f,all-week,afternoon,all-year,r2,100.6600,2,MUS$2010/kt,2045 +electricity,all-week,early-peak,all-year,r1,1.0271,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r2,3.3190,3,MUS$2010/PJ,2045 +CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2045 +gas,all-week,early-peak,all-year,r2,1.6265,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r2,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r2,184.6023,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 +CO2f,all-week,early-peak,all-year,r2,150.9900,3,MUS$2010/kt,2045 +electricity,all-week,late-peak,all-year,r1,3.2938,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r2,6.6380,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2045 +gas,all-week,late-peak,all-year,r2,4.3331,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r2,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r2,369.2047,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r2,301.9800,4,MUS$2010/kt,2045 +electricity,all-week,evening,all-year,r1,1.7826,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r2,4.4253,5,MUS$2010/PJ,2045 +CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2045 +gas,all-week,evening,all-year,r2,2.5287,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r2,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r2,246.1364,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.4082,0,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,r2,201.3200,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,22.4082,0,MUS$2010/kt,2050 -electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r2,2.5993,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2050 +gas,all-week,night,all-year,r2,1.1109,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r2,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r2,144.6382,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.6123,1,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,r2,122.2300,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,33.6123,1,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r2,3.8990,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2050 +gas,all-week,morning,all-year,r2,2.2065,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r2,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r2,216.9573,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.4082,2,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,r2,183.3450,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,22.4082,2,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r2,2.5993,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2050 +gas,all-week,afternoon,all-year,r2,1.1109,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r2,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r2,144.6382,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.6123,3,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,r2,122.2300,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,33.6123,3,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r2,3.8990,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2050 +gas,all-week,early-peak,all-year,r2,2.2065,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r2,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r2,216.9573,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,r2,183.3450,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,r1,2.5333,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r2,7.7980,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,80.9752,4,MUS$2010/kt,2050 +gas,all-week,late-peak,all-year,r2,5.4931,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r2,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r2,433.9147,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.8164,5,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r2,366.6900,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,44.8164,5,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r2,5.1987,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,r1,80.9752,5,MUS$2010/kt,2050 +gas,all-week,evening,all-year,r2,3.3020,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r2,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r2,289.2764,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r2,244.4600,5,MUS$2010/kt,2050 diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index e5695c215..b647efde6 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -233,14 +233,6 @@ def merit_order_supply( technologies, maxprod, prices=prices, timeslice_level=timeslice_level ) - # Normalise region dimension - if len(set(maxprod.region.values.flatten())) == 1: - if "region" in demand.dims: - demand = demand.sel(region=maxprod.region) - else: - # TODO: get this working with multi-region models - not a priority right now - raise ValueError("merit_order_supply not yet supported in multi-region models") - # Set capital costs and fixed costs to zero so they're not included in the # cost-minimisation technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) @@ -250,26 +242,41 @@ def merit_order_supply( result = xr.zeros_like(maxprod) for y in maxprod.year.values: - # Calculate timeslice-level costs for each asset in this year assuming full - # dispatch. We use LCOE excluding capital costs. - technology_costs = levelized_cost_of_energy( - technologies, - prices.sel(year=y), - capacity.sel(year=y), - production=maxprod.sel(year=y), - consumption=maxcons.sel(year=y), - ) - - # Calculate production for this year by dispatching assets in order of - # increasing cost until demand is met - for ts in maxprod.timeslice.values: - result.loc[dict(year=y, timeslice=ts)] = dispatch_by_merit_order( - demand=demand.sel(year=y, timeslice=ts), - minprod=minprod.sel(year=y, timeslice=ts), - maxprod=maxprod.sel(year=y, timeslice=ts), - technology_costs=technology_costs.sel(timeslice=ts), + prices_y = prices.sel(year=y) + capacity_y = capacity.sel(year=y) + maxprod_y = maxprod.sel(year=y) + minprod_y = minprod.sel(year=y) + maxcons_y = maxcons.sel(year=y) + + for region in demand.region.values: + maxprod_region = maxprod_y.where(maxprod_y.region == region, drop=True) + region_assets = maxprod_region.asset + techs_region = technologies.sel(asset=region_assets) + + # Calculate timeslice-level costs for each asset in this year assuming full + # dispatch. We use LCOE excluding capital costs. + technology_costs = levelized_cost_of_energy( + techs_region, + prices_y.where(prices_y.region == region, drop=True), + capacity_y.sel(asset=region_assets), + production=maxprod_region, + consumption=maxcons_y.sel(asset=region_assets), ) + minprod_region = minprod_y.sel(asset=region_assets) + + # Calculate production for this year by dispatching assets in order of + # increasing cost until demand is met + for ts in maxprod.timeslice.values: + result.loc[dict(year=y, timeslice=ts, asset=region_assets.values)] = ( + dispatch_by_merit_order( + demand=demand.sel(year=y, timeslice=ts, region=region), + minprod=minprod_region.sel(timeslice=ts), + maxprod=maxprod_region.sel(timeslice=ts), + technology_costs=technology_costs.sel(timeslice=ts), + ) + ) + # Add production of environmental pollutants env = is_pollutant(technologies.comm_usage) result[{"commodity": env}] = emission( From de88eeba12d29ef9495f5d57f226b4fa303b219f Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 18:21:06 +0100 Subject: [PATCH 11/41] Update tutorial model --- .../2-scenario/Results/MCACapacity.csv | 27 ++-- .../2-scenario/Results/MCAPrices.csv | 120 +++++++++--------- .../2-scenario/power/Technodata.csv | 2 +- .../add-new-technology/generate_models.py | 2 +- docs/user-guide/add-solar.ipynb | 8 +- 5 files changed, 81 insertions(+), 78 deletions(-) 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 bb6d8fe58..b4886a555 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -10,38 +10,41 @@ A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2030 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2035 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2035 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2040 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2040 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2040 +A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2040 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2040 A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2045 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2045 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2045 +A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2045 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2045 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2045 A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2050 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2050 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2050 +A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2050,r1,power,solarPV,newcapa,2050 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2050 A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index c554be553..13fd2146b 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 @@ -71,183 +71,183 @@ heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,17.3515,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.0427,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,17.3515,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.0427,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,17.3515,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.0427,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,17.3515,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.0427,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,17.3515,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.0427,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,17.3515,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.0427,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,13.1453,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.8131,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,15.8582,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.7956,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,13.1453,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.8131,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,15.8582,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.7956,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,18.5712,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.7781,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,17.2147,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.2869,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,12.4542,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,9.3092,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.8555,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,13.5662,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,15.2006,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.9407,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,12.4542,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,9.3092,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,7.8555,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,13.5662,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,15.2006,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.9407,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,22.2448,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.0507,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.0259,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.1223,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.9857,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.4833,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,11.6984,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,8.9673,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.5791,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.3211,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,12.3183,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.0190,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.0239,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.6777,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,11.6984,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,8.9673,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.5791,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.3211,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,12.3183,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.0190,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.0239,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.6777,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,24.4985,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.5075,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.4953,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.2177,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,12.6282,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,18.8139,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.2463,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,10.1917,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,11.1476,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,8.4591,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.2768,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.1843,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,11.5143,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,10.3405,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.5247,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.8050,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,11.1476,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,8.4591,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.2768,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.1843,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,11.5143,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,10.3405,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.5247,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.8050,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,24.3825,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,27.7747,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.3968,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.8004,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,13.9825,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,18.6938,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.6487,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.1230,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv b/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv index 3071ce1b1..de98a2712 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/power/Technodata.csv @@ -3,5 +3,5 @@ gasCCGT,R1,2020,23.78234399,0,0,10,0.5,100,35,0.9,0.1,1 gasCCGT,R1,2040,23.78234399,0,0,10,0.5,100,35,0.9,0.1,1 windturbine,R1,2020,36.30771182,0,0,10,0.5,100,25,0.4,0.1,1 windturbine,R1,2040,36.30771182,0,0,10,0.5,100,25,0.4,0.1,1 -solarPV,R1,2020,40.0,0,0,10,0.5,100,25,0.4,0.1,1 +solarPV,R1,2020,100.0,0,0,10,0.5,100,25,0.4,0.1,1 solarPV,R1,2040,30.0,0,0,10,0.5,100,25,0.4,0.1,1 diff --git a/docs/tutorial-code/add-new-technology/generate_models.py b/docs/tutorial-code/add-new-technology/generate_models.py index 45c676474..74d79fd75 100644 --- a/docs/tutorial-code/add-new-technology/generate_models.py +++ b/docs/tutorial-code/add-new-technology/generate_models.py @@ -80,7 +80,7 @@ def generate_model_2() -> None: # Modify cap_par for solarPV technodata_file = model_path / "power/Technodata.csv" df = pd.read_csv(technodata_file) - df.loc[(df["technology"] == "solarPV") & (df["year"] == 2020), "cap_par"] = 40 + df.loc[(df["technology"] == "solarPV") & (df["year"] == 2020), "cap_par"] = 100 df.loc[(df["technology"] == "solarPV") & (df["year"] == 2040), "cap_par"] = 30 df.to_csv(technodata_file, index=False) diff --git a/docs/user-guide/add-solar.ipynb b/docs/user-guide/add-solar.ipynb index 5de85b795..2d5e3b832 100644 --- a/docs/user-guide/add-solar.ipynb +++ b/docs/user-guide/add-solar.ipynb @@ -292,10 +292,10 @@ "|**gasCCGT**|**R1**|**2040**|**23.78234399**|**1**|**…**|**1**|\n", "|windturbine|R1|2020|36.30771182|1|…|1|\n", "|**windturbine**|**R1**|**2040**|**36.30771182**|**1**|**…**|**1**|\n", - "|solarPV|R1|2020|**40**|1|...|1|\n", + "|solarPV|R1|2020|**100**|1|...|1|\n", "|**solarPV**|**R1**|**2040**|**30**|**1**|**...**|**1**|\n", "\n", - "Here, we increase `cap_par` for `solarPV` to 40 in the year 2020, and create a new row for 2040 with a reduced `cap_par` of 30.\n", + "Here, we increase `cap_par` for `solarPV` to 100 in the year 2020, and create a new row for 2040 with a reduced `cap_par` of 30.\n", "\n", "MUSE uses interpolation for the years which are unknown. So in this example, for the benchmark years between 2020 and 2040 (2025, 2030, 2035), MUSE uses interpolated `cap_par` values. The interpolation mode can be set in the `settings.toml` file, and defaults to linear interpolation. This example uses the default setting for interpolation.\n", "\n", @@ -357,7 +357,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -371,7 +371,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, From 7cf9d3731c05bd37f4625a16645e038ba97ab172 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 20:33:45 +0100 Subject: [PATCH 12/41] Update documentation Co-authored-by: Copilot --- docs/api.rst | 4 ++-- docs/application-flow.rst | 3 ++- docs/inputs/toml.rst | 9 +++++---- src/muse/dispatch.py | 9 +++++---- src/muse/outputs/mca.py | 8 ++++---- tests/test_dispatch.py | 12 ++++++------ 6 files changed, 24 insertions(+), 21 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 475231fa1..f7e7c939d 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -56,10 +56,10 @@ PresetSector :members: -Production +Dispatch ~~~~~~~~~~ -.. automodule:: muse.production +.. automodule:: muse.dispatch :members: diff --git a/docs/application-flow.rst b/docs/application-flow.rst index 0555177b6..f2efea1e1 100644 --- a/docs/application-flow.rst +++ b/docs/application-flow.rst @@ -502,7 +502,8 @@ The dispatch stage when running a sector can be described by the following graph After the investment stage is completed, then the new capacity of the sector is obtained by aggregating the assets of all agents of the sector. Then, the supply of commodities is calculated as requested by the ``dispatch_production`` argument defined for each sector in the ``settings.toml`` file. -There are two possible options for ``dispatch_production`` built into MUSE: +There are three possible options for ``dispatch_production`` built into MUSE: +- ``merit-order``: supply is obtained by dispatching the cheapest assets first until the demand is met. - ``share``: assets each supply a proportion of demand based on their share of total capacity. - ``maximum``: all the assets dispatch their maximum production, regardless of the demand. diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index e793b78ed..c1997dd5c 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -218,13 +218,14 @@ A sector accepts these attributes: ``dispatch_production`` (optional, default = **share**) The method used to calculate supply of commodities after investments have been made. - MUSE provides two methods in :py:mod:`muse.production`: + MUSE provides three methods in :py:mod:`muse.dispatch`: - * **share**: assets each supply a proportion of demand based on their share of total capacity. - * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. See :py:func:`muse.production.maximum_production`. + * **share**: assets each supply a proportion of demand based on their share of total capacity. See :py:func:`muse.dispatch.share_based_production`. + * **merit-order**: supply is obtained by dispatching the cheapest assets first until the demand is met. See :py:func:`muse.dispatch.merit_order_production`. + * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. See :py:func:`muse.dispatch.maximum_production`. Additional methods can be registered with - :py:func:`muse.production.register_production` + :py:func:`muse.dispatch.register_dispatch` ``technodata`` Path to a csv file containing the characterization of the technologies involved in diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index b647efde6..8f95483c8 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -36,8 +36,9 @@ def production( "PRODUCTION_SIGNATURE", "factory", "maximum_production", + "merit_order_production", "register_production", - "share_based_supply", + "share_based_production", ] from collections.abc import MutableMapping @@ -93,7 +94,7 @@ def maximum_production( @register_production(name=("share", "shares")) -def share_based_supply( +def share_based_production( demand: xr.DataArray, capacity: xr.DataArray, technologies: xr.Dataset, @@ -184,7 +185,7 @@ def share_based_supply( @register_production(name=("merit", "merit_order")) -def merit_order_supply( +def merit_order_production( demand: xr.DataArray, capacity: xr.DataArray, technologies: xr.Dataset, @@ -201,7 +202,7 @@ def merit_order_supply( Each timeslice and year is treated independently, so the dispatch order can vary across timeslices and years. For an example in a single timeslice/year/region, see - the docstring of :py:func:`merit_order_dispatch`. + the docstring of :py:func:`dispatch_by_merit_order`. This is best suited to sectors where demand can be met by any of a number of assets, and where there is a strong economic rationale for preferentially dispatching diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 14bb114e3..a3703c432 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -195,7 +195,7 @@ def sector_fuel_costs( """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel from muse.dispatch import ( - share_based_supply, + share_based_production, ) # TODO: should not have to recalculate supply from muse.quantities import consumption @@ -216,7 +216,7 @@ def sector_fuel_costs( year=year, ).fillna(0.0) - production = share_based_supply( + production = share_based_production( agent_market.consumption, capacity, technologies, @@ -301,7 +301,7 @@ def sector_emission_costs( """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant from muse.dispatch import ( - share_based_supply, + share_based_production, ) # TODO: should not have to recalculate supply data_sector: list[xr.DataArray] = [] @@ -327,7 +327,7 @@ def sector_emission_costs( i = (np.where(envs))[0][0] red_envs = envs[i].commodity.values prices = a.filter_input(market.prices, year=year, commodity=red_envs) - production = share_based_supply( + production = share_based_production( agent_market.consumption, capacity, technologies, diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 1142b68a0..c5f461bef 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -31,7 +31,7 @@ def test_share_based_supply_single_region( production: xr.DataArray, timeslice, ): - from muse.dispatch import share_based_supply + from muse.dispatch import share_based_production # Setup single region data region = "USA" @@ -44,7 +44,7 @@ def test_share_based_supply_single_region( assert "region" not in demand.dims # Test supply matches demand for end-use commodities - spl = share_based_supply(demand, capacity, technologies).sum("asset") + spl = share_based_production(demand, capacity, technologies).sum("asset") enduses = is_enduse(technologies.comm_usage) assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 @@ -55,7 +55,7 @@ def test_share_based_supply_multi_region( production: xr.DataArray, timeslice, ): - from muse.dispatch import share_based_supply + from muse.dispatch import share_based_production # Create random demand demand = production.groupby("region").sum("asset") @@ -64,7 +64,7 @@ def test_share_based_supply_multi_region( # Test supply matches demand for end-use commodities by region spl = ( - share_based_supply(demand, capacity, technologies) + share_based_production(demand, capacity, technologies) .groupby("region") .sum("asset") ) @@ -78,7 +78,7 @@ def test_share_based_supply_with_min_service( production: xr.DataArray, timeslice, ): - from muse.dispatch import share_based_supply + from muse.dispatch import share_based_production from muse.quantities import minimum_production technologies["minimum_service_factor"] = 0.3 @@ -89,7 +89,7 @@ def test_share_based_supply_with_min_service( demand = demand * np.random.rand(*demand.shape) # Test supply meets minimum production constraint - spl = share_based_supply(demand, capacity, technologies) + spl = share_based_production(demand, capacity, technologies) assert (spl >= minprod).all() From 5fc2a159c2f2eba458d1f5b02e6e4750e09ccd35 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 20:48:04 +0100 Subject: [PATCH 13/41] Add new method to documentation --- docs/inputs/toml.rst | 14 +++++++++++--- src/muse/dispatch.py | 25 +++++++++++++++---------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index c1997dd5c..784bd743d 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -220,9 +220,17 @@ A sector accepts these attributes: MUSE provides three methods in :py:mod:`muse.dispatch`: - * **share**: assets each supply a proportion of demand based on their share of total capacity. See :py:func:`muse.dispatch.share_based_production`. - * **merit-order**: supply is obtained by dispatching the cheapest assets first until the demand is met. See :py:func:`muse.dispatch.merit_order_production`. - * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. See :py:func:`muse.dispatch.maximum_production`. + * **share**: assets each supply a proportion of demand based on their share of total capacity. + This method is most appropriate for sectors where demand is inherently distributed across assets and cannot be shifted between them + (e.g. residential heating systems, where assets in each household meets their own share of the demand). + See :py:func:`muse.dispatch.share_based_production`. + * **merit-order**: supply in each timeslice is obtained by dispatching the cheapest assets first until the demand is met. + See :py:func:`muse.dispatch.merit_order_production`. + This method is best suited to sectors where supply is pooled across assets and short-run marginal cost is the dominant driver of dispatch decisions + (e.g. electricity production). + * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. + This is largely intended for testing purposes. + See :py:func:`muse.dispatch.maximum_production`. Additional methods can be registered with :py:func:`muse.dispatch.register_dispatch` diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 8f95483c8..7be69cb47 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -196,18 +196,23 @@ def merit_order_production( ) -> xr.DataArray: """Service demand by preferentially dispatching the cheapest assets. - This method fully utilises the cheapest assets (up to their maximum production) - before dispatching more expensive assets, until demand is met, whilst also - respecting minimum production constraints. + This function allocates production across a set of assets by dispatching them + in order of increasing marginal cost (i.e. cheapest first), until demand is met. + Each asset is operated between its minimum and maximum production constraints, + and higher-cost assets are only used once cheaper options are exhausted. - Each timeslice and year is treated independently, so the dispatch order can vary - across timeslices and years. For an example in a single timeslice/year/region, see - the docstring of :py:func:`dispatch_by_merit_order`. + The merit-order principle is widely used in systems where: + - Multiple assets can supply a homogeneous or substitutable service + - Supply is pooled or centrally coordinated + - Short-run marginal cost is the dominant driver of dispatch decisions + + A good example is the power sector (electricity production), where supply from all + assets feeds into a common grid. Low cost generators are drawn on first, followed by + more expensive generators as grid demand increases. - This is best suited to sectors where demand can be met by any of a number of assets, - and where there is a strong economic rationale for preferentially dispatching - cheaper assets. A good example is the electricity production sector, where - demand/supply are generally pooled across assets in a common grid. + Each timeslice and year is treated independently, so the dispatch order can vary + across timeslices and years. For a numerical example in a single + timeslice/year/region, see the docstring of :py:func:`dispatch_by_merit_order`. """ from muse.commodities import CommodityUsage, check_usage, is_pollutant from muse.costs import levelized_cost_of_energy From cd84afff5430b2985dd5904e3c89353851302eac Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 5 May 2026 21:01:39 +0100 Subject: [PATCH 14/41] Copilot suggestions Co-authored-by: Copilot --- docs/advanced-guide/extending-muse.ipynb | 2 +- docs/inputs/toml.rst | 19 +++++++++---------- src/muse/dispatch.py | 21 +++++++++++++++------ src/muse/sectors/sector.py | 2 +- tests/conftest.py | 2 +- 5 files changed, 27 insertions(+), 19 deletions(-) diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index 40182460c..10c6d88b2 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/docs/advanced-guide/extending-muse.ipynb @@ -23,7 +23,7 @@ " that interact together.\n", "- `register_agent_interaction` in `muse.interactions`: Given a list of\n", " interacting agents, perform the interaction.\n", - "- `register_production` in `muse.production`: A method to compute the production\n", + "- `register_production` in `muse.dispatch`: A method to compute the production\n", " from a sector, given the demand and the capacity.\n", "- `register_initial_asset_transform` in `muse.hooks`: Allows any kind of transformation to be applied to the assets of an agent, prior to investing.\n", "- `register_final_asset_transform` in `muse.hooks`: After computing the investment, this sets the assets that will be owned by the agents.\n", diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index 784bd743d..bc9637250 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -221,19 +221,18 @@ A sector accepts these attributes: MUSE provides three methods in :py:mod:`muse.dispatch`: * **share**: assets each supply a proportion of demand based on their share of total capacity. - This method is most appropriate for sectors where demand is inherently distributed across assets and cannot be shifted between them - (e.g. residential heating systems, where assets in each household meets their own share of the demand). - See :py:func:`muse.dispatch.share_based_production`. + This method is most appropriate for sectors where demand is inherently distributed across assets and cannot be shifted between them + (e.g. residential heating systems, where assets in each household meets their own share of the demand). + See :py:func:`muse.dispatch.share_based_production`. * **merit-order**: supply in each timeslice is obtained by dispatching the cheapest assets first until the demand is met. - See :py:func:`muse.dispatch.merit_order_production`. - This method is best suited to sectors where supply is pooled across assets and short-run marginal cost is the dominant driver of dispatch decisions - (e.g. electricity production). + See :py:func:`muse.dispatch.merit_order_production`. + This method is best suited to sectors where supply is pooled across assets and short-run marginal cost is the dominant driver of dispatch decisions + (e.g. electricity production). * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. - This is largely intended for testing purposes. - See :py:func:`muse.dispatch.maximum_production`. + This is largely intended for testing purposes. + See :py:func:`muse.dispatch.maximum_production`. - Additional methods can be registered with - :py:func:`muse.dispatch.register_dispatch` + Additional methods can be registered with :py:func:`muse.dispatch.register_dispatch` ``technodata`` Path to a csv file containing the characterization of the technologies involved in diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 7be69cb47..728630569 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -42,17 +42,26 @@ def production( ] from collections.abc import MutableMapping -from typing import Callable +from typing import Any, Protocol import numpy as np import xarray as xr from muse.registration import registrator -"""Production signature.""" -PRODUCTION_SIGNATURE = Callable[ - [xr.Dataset, xr.DataArray, xr.Dataset, str], xr.DataArray -] + +class PRODUCTION_SIGNATURE(Protocol): + """Callable protocol for registered production methods.""" + + def __call__( + self, + demand: xr.DataArray, + capacity: xr.DataArray, + technologies: xr.Dataset, + timeslice_level: str | None = None, + **kwargs: Any, + ) -> xr.DataArray: ... + """Dictionary of production methods. """ PRODUCTION_METHODS: MutableMapping[str, PRODUCTION_SIGNATURE] = {} @@ -64,7 +73,7 @@ def register_production(function: PRODUCTION_SIGNATURE): .. seealso:: - :py:mod:`muse.production` + :py:mod:`muse.dispatch` """ return function diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index e35a66a29..eb6395e54 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -154,7 +154,7 @@ def __init__( """Computes production as used to return the supply to the MCA. It can be anything registered with - :py:func:`@register_production`. + :py:func:`@register_production`. """ self.supply_prod = supply_prod diff --git a/tests/conftest.py b/tests/conftest.py index d5d728e82..3d1f3b434 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -576,7 +576,7 @@ def saveme(module_name: str, registry_name: str): saveme("muse.hooks", "INITIAL_ASSET_TRANSFORM"), saveme("muse.hooks", "FINAL_ASSET_TRANSFORM"), saveme("muse.investments", "INVESTMENTS"), - saveme("muse.production", "PRODUCTION_METHODS"), + saveme("muse.dispatch", "PRODUCTION_METHODS"), saveme("muse.outputs.mca", "OUTPUT_QUANTITIES"), saveme("muse.outputs.sectors", "OUTPUT_QUANTITIES"), saveme("muse.outputs.sinks", "OUTPUT_SINKS"), From b5ea292a36922f9843f40155af92e36234ba47fa Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 09:54:23 +0100 Subject: [PATCH 15/41] Revert dispatch method for some example model sectors --- .../1-single-objective/settings.toml | 2 +- .../2-multiple-objective/settings.toml | 2 +- .../1-correlation/settings.toml | 2 +- .../1-introduction/settings.toml | 2 +- .../2-scenario/settings.toml | 2 +- .../1-new-region/Results/MCACapacity.csv | 45 +-- .../1-new-region/Results/MCAPrices.csv | 292 +++++++++--------- .../1-new-region/Results/MCASupply.csv | 184 ++++++----- .../add-region/1-new-region/settings.toml | 2 +- .../1-residential-subsectors/settings.toml | 2 +- .../2-agents/settings.toml | 2 +- .../1-exogenous-demand/settings.toml | 2 +- .../1-carbon-budget/settings.toml | 2 +- .../1-min-constraint/settings.toml | 2 +- .../2-max-constraint/settings.toml | 2 +- .../1-modify-timeslices/settings.toml | 2 +- .../2-modify-time-framework/settings.toml | 2 +- src/muse/data/example/default/settings.toml | 2 +- .../example/default_timeslice/settings.toml | 2 +- .../example/minimum_service/settings.toml | 2 +- src/muse/dispatch.py | 2 +- .../minimum_service/Results/MCAPrices.csv | 48 +-- .../minimum_service/Results/MCASupply.csv | 36 +-- 23 files changed, 333 insertions(+), 308 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/settings.toml b/docs/tutorial-code/add-agent/1-single-objective/settings.toml index e9b85f741..c49fe9162 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/add-agent/1-single-objective/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml index e9b85f741..c49fe9162 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml index bc407b144..c7e07fff6 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml index fa90ff37b..6913e2688 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml +++ b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml index fa90ff37b..6913e2688 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml +++ b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' 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 0c5a0634c..276e14f3d 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 @@ -14,7 +14,7 @@ A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2025 -A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2025 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2025 @@ -28,11 +28,12 @@ A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2030 A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 -A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2030 -A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2030 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2030 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2030 +A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,7.5000,r2,2020,r2,gas,gassupply1,newcapa,2030 A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2030 A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2030 @@ -45,11 +46,12 @@ A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2035 -A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2035 -A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2035 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2035 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2035 +A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2035 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2035 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2035 A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2035 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2035 @@ -64,11 +66,12 @@ A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2040 -A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2040 -A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2040 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2040 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2040 +A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2040 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2040 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2040 A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2040 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2040 @@ -85,11 +88,12 @@ A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,5.3437,r2,2025,r2,power,windturbine,newcapa,2045 -A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2045 -A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2045 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2045 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2045 +A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2045 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2045 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2045 A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2045 A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2045 @@ -108,11 +112,12 @@ A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,13.2500,r2,2030,r2,power,windturbine,newcapa,2050 -A1,1.4063,r2,2035,r2,power,windturbine,newcapa,2050 -A1,5.3437,r2,2050,r2,power,windturbine,newcapa,2050 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2050 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2050 +A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2050 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2050 A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,9.2200,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2050 A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2050 A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2050 A1,13.4208,r2,2035,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 754310ea1..b7ee17c09 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 @@ -64,9 +64,9 @@ gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,8.1065,r2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,17.3700,r2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.7895,r2,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r2,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 @@ -74,9 +74,9 @@ gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,8.1065,r2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,17.3700,r2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.7895,r2,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r2,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 @@ -84,9 +84,9 @@ gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,8.1065,r2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,17.3700,r2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.7895,r2,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r2,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 @@ -94,9 +94,9 @@ gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,8.1065,r2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,17.3700,r2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.7895,r2,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r2,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 @@ -104,9 +104,9 @@ gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,8.1065,r2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,17.3700,r2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.7895,r2,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r2,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 @@ -114,308 +114,308 @@ gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,8.1065,r2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,17.3700,r2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.7895,r2,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,22.0164,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.6253,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.4787,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.3817,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,9.0602,r2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,17.8205,r2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.6487,r2,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,23.3215,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,22.1149,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.8022,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.5031,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,9.0602,r2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,17.8205,r2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.6487,r2,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,22.0164,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.6253,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.4787,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.3817,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,9.0602,r2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,17.8205,r2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.6487,r2,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,23.3215,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,22.1149,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.8022,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.5031,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,9.0602,r2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,17.8205,r2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.6487,r2,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,32.1823,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,33.8719,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.9990,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.4178,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,9.0602,r2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,17.8205,r2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.6487,r2,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,26.6772,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,25.4663,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.6342,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.3339,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,9.0602,r2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,17.8205,r2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.6487,r2,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.4546,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,26.9455,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.5793,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.3756,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,9.2191,r2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,19.9776,r2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,14.4773,r2,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,28.4757,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,27.2811,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,13.9877,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.5099,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,16.5393,r2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.4773,r2,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,27.4546,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,26.9455,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.5793,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.3756,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,9.2191,r2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,19.9776,r2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,14.4773,r2,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,28.4757,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,27.2811,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,13.9877,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.5099,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,16.5393,r2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.4773,r2,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,38.1823,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,36.6832,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,17.8703,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,17.2707,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,16.5393,r2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.4773,r2,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,33.8312,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,30.5891,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,16.1299,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.8331,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,16.5393,r2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.4773,r2,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,32.7604,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,32.2513,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.7016,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.4979,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,18.7064,r2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.9389,r2,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,33.6344,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,32.5869,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.0512,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.6322,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,18.7064,r2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.9389,r2,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,32.7604,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,32.2513,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.7016,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.4979,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,18.7064,r2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.9389,r2,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,33.6344,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,32.5869,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.0512,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.6322,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,18.7064,r2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.9389,r2,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,38.3552,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,44.3086,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.9395,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.3209,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,18.7064,r2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,16.9389,r2,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,33.7672,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,34.9664,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.1043,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.5840,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,18.7064,r2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.9389,r2,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,40.2032,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,39.6941,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.6787,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.4751,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,22.1480,r2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,20.6015,r2,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,35.5625,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,40.0297,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,16.8224,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,18.6093,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,22.1480,r2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,20.6015,r2,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,40.2032,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,39.6941,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.6787,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.4751,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,22.1480,r2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,20.6015,r2,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,35.5625,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,40.0297,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,16.8224,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,18.6093,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,22.1480,r2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,20.6015,r2,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,40.9897,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,49.8091,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.9933,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.5210,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,22.1480,r2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,20.6015,r2,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,33.3896,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,41.1067,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,15.9533,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,19.0401,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,22.1480,r2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,20.6015,r2,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,47.7883,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,47.1369,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,21.7127,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.4522,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,night,all-year,31.9817,r2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,25.9924,r2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,24.6177,r2,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,47.7883,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,47.4725,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.7127,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.5864,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,31.9817,r2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.9924,r2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,24.6177,r2,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,47.7883,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,47.1369,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,21.7127,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.4522,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,31.9817,r2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,25.9924,r2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,24.6177,r2,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,47.7883,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,47.4725,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.7127,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.5864,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,31.9817,r2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.9924,r2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,24.6177,r2,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,55.6173,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,53.5725,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,24.8443,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,24.0264,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,31.9817,r2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,25.9924,r2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,24.6177,r2,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,47.8436,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,47.2470,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.7349,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.4962,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,31.9817,r2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,25.9924,r2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,24.6177,r2,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv index 20dc72bd2..90e5f6921 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv @@ -2,268 +2,288 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year gas,all-week,night,all-year,r1,1.1600,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,r1,1.0000,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,r1,64.7100,0,MUS$2010/kt,2020 +gas,all-week,night,all-year,r2,1.1600,0,MUS$2010/PJ,2020 heat,all-week,night,all-year,r2,1.0000,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,r2,64.7100,0,MUS$2010/kt,2020 gas,all-week,morning,all-year,r1,1.7400,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,r1,1.5000,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,r1,97.0650,1,MUS$2010/kt,2020 +gas,all-week,morning,all-year,r2,1.7400,1,MUS$2010/PJ,2020 heat,all-week,morning,all-year,r2,1.5000,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,r2,97.0650,1,MUS$2010/kt,2020 gas,all-week,afternoon,all-year,r1,1.1600,2,MUS$2010/PJ,2020 heat,all-week,afternoon,all-year,r1,1.0000,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,r1,64.7100,2,MUS$2010/kt,2020 +gas,all-week,afternoon,all-year,r2,1.1600,2,MUS$2010/PJ,2020 heat,all-week,afternoon,all-year,r2,1.0000,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,r2,64.7100,2,MUS$2010/kt,2020 gas,all-week,early-peak,all-year,r1,1.7400,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,r1,1.5000,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,r1,97.0650,3,MUS$2010/kt,2020 +gas,all-week,early-peak,all-year,r2,1.7400,3,MUS$2010/PJ,2020 heat,all-week,early-peak,all-year,r2,1.5000,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,r2,97.0650,3,MUS$2010/kt,2020 gas,all-week,late-peak,all-year,r1,1.9333,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,r1,1.6667,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 +gas,all-week,late-peak,all-year,r2,1.9333,4,MUS$2010/PJ,2020 heat,all-week,late-peak,all-year,r2,1.6667,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,r2,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 +gas,all-week,evening,all-year,r2,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r2,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r2,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 +gas,all-week,night,all-year,r2,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r2,1.3333,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,r2,58.9805,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r2,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r2,2.0000,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,r2,88.4707,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r2,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r2,1.3333,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,r2,58.9805,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r2,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r2,2.0000,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,r2,88.4707,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,3.1719,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r2,3.1719,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r2,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r2,176.9414,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r2,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r2,2.6667,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,r2,117.9609,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4251,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,r1,78.8830,0,MUS$2010/kt,2030 +gas,all-week,night,all-year,r2,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r2,1.6667,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,r2,41.0055,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1377,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,r1,118.3245,1,MUS$2010/kt,2030 +gas,all-week,morning,all-year,r2,1.1026,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r2,2.5000,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,r2,61.5082,1,MUS$2010/kt,2030 electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4251,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,r1,78.8830,2,MUS$2010/kt,2030 +gas,all-week,afternoon,all-year,r2,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r2,1.6667,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,r2,41.0055,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1377,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,r1,118.3245,3,MUS$2010/kt,2030 +gas,all-week,early-peak,all-year,r2,1.1026,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r2,2.5000,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,r2,61.5082,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.7458,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,236.6490,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 +gas,all-week,late-peak,all-year,r2,2.2052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r2,5.0000,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,r2,123.0164,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.9194,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.6948,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,157.7660,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,149.2356,5,MUS$2010/kt,2030 +gas,all-week,evening,all-year,r2,1.4701,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r2,3.3333,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,r2,82.0109,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.0311,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2035 +gas,all-week,night,all-year,r2,1.0311,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r2,2.0000,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,r2,57.5200,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2035 -gas,all-week,morning,all-year,r2,0.4665,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r2,1.5467,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r2,3.0000,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,r2,86.2800,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.0311,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2035 +gas,all-week,afternoon,all-year,r2,1.0311,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r2,2.0000,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,r2,57.5200,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2035 -gas,all-week,early-peak,all-year,r2,0.4665,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r2,1.5467,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r2,3.0000,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,r2,86.2800,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.4938,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,1.3333,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2035 -gas,all-week,late-peak,all-year,r2,2.0131,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 +gas,all-week,late-peak,all-year,r2,3.0933,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r2,6.0000,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,r2,172.5600,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.2493,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2035 -gas,all-week,evening,all-year,r2,0.9820,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2035 +gas,all-week,evening,all-year,r2,2.0622,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r2,4.0000,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,r2,115.0400,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2040 -gas,all-week,night,all-year,r2,0.3376,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r2,1.4178,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r2,2.3333,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,r2,79.0900,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r1,0.8271,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2040 -gas,all-week,morning,all-year,r2,1.0465,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r2,2.1267,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r2,3.5000,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,r2,118.6350,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2040 -gas,all-week,afternoon,all-year,r2,0.3376,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r2,1.4178,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r2,2.3333,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,r2,79.0900,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r1,0.8271,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2040 -gas,all-week,early-peak,all-year,r2,1.0465,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r2,2.1267,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r2,3.5000,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,r2,118.6350,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r1,2.8938,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,r1,1.7333,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2040 -gas,all-week,late-peak,all-year,r2,3.1731,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 +gas,all-week,late-peak,all-year,r2,4.2533,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r2,7.0000,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,r2,237.2700,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r1,1.5160,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2040 -gas,all-week,evening,all-year,r2,1.7553,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2040 +gas,all-week,evening,all-year,r2,2.8356,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r2,4.6667,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,r2,158.1800,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2045 -gas,all-week,night,all-year,r2,0.7242,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,r2,1.8044,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r2,2.6667,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,r2,100.6600,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r1,1.0271,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2045 -gas,all-week,morning,all-year,r2,1.6265,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r2,2.7067,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r2,4.0000,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,r2,150.9900,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2045 -gas,all-week,afternoon,all-year,r2,0.7242,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,r2,1.8044,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r2,2.6667,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,r2,100.6600,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r1,1.0271,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2045 -gas,all-week,early-peak,all-year,r2,1.6265,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r2,2.7067,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r2,4.0000,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,r2,150.9900,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r1,3.2938,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,r1,2.1333,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,113.6326,4,MUS$2010/kt,2045 -gas,all-week,late-peak,all-year,r2,4.3331,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 +gas,all-week,late-peak,all-year,r2,5.4133,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r2,8.0000,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,r2,301.9800,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r1,1.7826,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,81.4844,5,MUS$2010/kt,2045 -gas,all-week,evening,all-year,r2,2.5287,5,MUS$2010/PJ,2045 +CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2045 +gas,all-week,evening,all-year,r2,3.6089,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r2,5.3333,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,r2,201.3200,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,1.0802,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2050 -gas,all-week,night,all-year,r2,1.1109,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,r2,2.1911,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r2,3.0000,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,r2,122.2300,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,1.0802,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2050 -gas,all-week,morning,all-year,r2,2.2065,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r2,3.2867,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r2,4.5000,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,r2,183.3450,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,1.0802,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2050 -gas,all-week,afternoon,all-year,r2,1.1109,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,r2,2.1911,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r2,3.0000,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,r2,122.2300,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,1.0802,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2050 -gas,all-week,early-peak,all-year,r2,2.2065,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r2,3.2867,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r2,4.5000,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,r2,183.3450,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,2.5333,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,1.0802,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,80.9752,4,MUS$2010/kt,2050 -gas,all-week,late-peak,all-year,r2,5.4931,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 +gas,all-week,late-peak,all-year,r2,6.5733,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r2,9.0000,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,r2,366.6900,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,1.0802,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,80.9752,5,MUS$2010/kt,2050 -gas,all-week,evening,all-year,r2,3.3020,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2050 +gas,all-week,evening,all-year,r2,4.3822,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r2,6.0000,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,r2,244.4600,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/settings.toml b/docs/tutorial-code/add-region/1-new-region/settings.toml index bb7d3b548..b3b27151a 100644 --- a/docs/tutorial-code/add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/add-region/1-new-region/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml index 7fcfcc07e..ee2c0e9aa 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/settings.toml @@ -63,7 +63,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml b/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml index 8293dab32..38be67f65 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/settings.toml @@ -63,7 +63,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml index e9b85f741..c49fe9162 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml index 39a727621..bd440168b 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml index 2f4408094..0ed44c23a 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml @@ -63,7 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml index 2f4408094..0ed44c23a 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml @@ -63,7 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml index def70b9a7..7126be169 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/settings.toml @@ -58,7 +58,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml index c0bbc6b87..80b74e73a 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/settings.toml @@ -58,7 +58,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index e9b85f741..c49fe9162 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/settings.toml @@ -57,7 +57,7 @@ existing_capacity = '{path}/power/ExistingCapacity.csv' [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index 2f4408094..0ed44c23a 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/settings.toml @@ -63,7 +63,7 @@ filename = "{cwd}/{default_output_dir}/{Sector}_{Quantity}.csv" [sectors.gas] type = 'default' priority = 3 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/gas/Technodata.csv' commodities_in = '{path}/gas/CommIn.csv' commodities_out = '{path}/gas/CommOut.csv' diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml index a0fb7af30..0617dad4e 100644 --- a/src/muse/data/example/minimum_service/settings.toml +++ b/src/muse/data/example/minimum_service/settings.toml @@ -28,7 +28,7 @@ global_commodities = '{path}/GlobalCommodities.csv' [sectors.industry] type = 'default' priority = 1 -dispatch_production = "merit-order" +dispatch_production = "share" technodata = '{path}/industry/Technodata.csv' commodities_in = '{path}/industry/CommIn.csv' commodities_out = '{path}/industry/CommOut.csv' diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 728630569..69464479b 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -193,7 +193,7 @@ def share_based_production( return result -@register_production(name=("merit", "merit_order")) +@register_production(name=("merit", "merit-order")) def merit_order_production( demand: xr.DataArray, capacity: xr.DataArray, diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 6f8eb92d2..5df6205d7 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -29,7 +29,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 fuel1,all-week,all-day,winter,1.0877,r1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.5169,r1,0,MUS$2010/PJ,2015 fuel3,all-week,all-day,winter,0.0617,r1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,391.6106,r1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,392.9559,r1,0,MUS$2010/Mt,2015 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 @@ -38,7 +38,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2015 fuel1,all-week,all-day,summer,1.0877,r1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.5169,r1,1,MUS$2010/PJ,2015 fuel3,all-week,all-day,summer,0.0617,r1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,393.1583,r1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,392.9559,r1,1,MUS$2010/Mt,2015 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 @@ -47,7 +47,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2015 fuel1,all-week,all-day,spring-autumn,1.0877,r1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.5169,r1,2,MUS$2010/PJ,2015 fuel3,all-week,all-day,spring-autumn,0.0617,r1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,391.6106,r1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,392.9559,r1,2,MUS$2010/Mt,2015 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 @@ -56,7 +56,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2015 fuel1,all-week,all-day,winter,1.1754,r1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.4826,r1,0,MUS$2010/PJ,2020 fuel3,all-week,all-day,winter,0.0702,r1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,414.6444,r1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,415.4326,r1,0,MUS$2010/Mt,2020 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 @@ -65,7 +65,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2020 fuel1,all-week,all-day,summer,1.1754,r1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.4826,r1,1,MUS$2010/PJ,2020 fuel3,all-week,all-day,summer,0.0702,r1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,415.6344,r1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,415.4326,r1,1,MUS$2010/Mt,2020 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 @@ -74,7 +74,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2020 fuel1,all-week,all-day,spring-autumn,1.1754,r1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.4826,r1,2,MUS$2010/PJ,2020 fuel3,all-week,all-day,spring-autumn,0.0702,r1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,414.6444,r1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,415.4326,r1,2,MUS$2010/Mt,2020 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 @@ -83,7 +83,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2020 fuel1,all-week,all-day,winter,1.1667,r1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.7108,r1,0,MUS$2010/PJ,2025 fuel3,all-week,all-day,winter,0.0828,r1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,468.9620,r1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,469.8328,r1,0,MUS$2010/Mt,2025 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 @@ -92,7 +92,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2025 fuel1,all-week,all-day,summer,1.1667,r1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.7108,r1,1,MUS$2010/PJ,2025 fuel3,all-week,all-day,summer,0.0828,r1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,470.0343,r1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,469.8328,r1,1,MUS$2010/Mt,2025 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 @@ -101,7 +101,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2025 fuel1,all-week,all-day,spring-autumn,1.1667,r1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.7108,r1,2,MUS$2010/PJ,2025 fuel3,all-week,all-day,spring-autumn,0.0828,r1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,468.9620,r1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,469.8328,r1,2,MUS$2010/Mt,2025 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 @@ -110,7 +110,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2025 fuel1,all-week,all-day,winter,1.1579,r1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.9390,r1,0,MUS$2010/PJ,2030 fuel3,all-week,all-day,winter,0.0954,r1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,522.5924,r1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,523.5661,r1,0,MUS$2010/Mt,2030 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 @@ -119,7 +119,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2030 fuel1,all-week,all-day,summer,1.1579,r1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.9390,r1,1,MUS$2010/PJ,2030 fuel3,all-week,all-day,summer,0.0954,r1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,523.7673,r1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,523.5661,r1,1,MUS$2010/Mt,2030 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 @@ -128,7 +128,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2030 fuel1,all-week,all-day,spring-autumn,1.1579,r1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.9390,r1,2,MUS$2010/PJ,2030 fuel3,all-week,all-day,spring-autumn,0.0954,r1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,522.5924,r1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,523.5661,r1,2,MUS$2010/Mt,2030 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 @@ -137,7 +137,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2030 fuel1,all-week,all-day,winter,1.1491,r1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.8155,r1,0,MUS$2010/PJ,2035 fuel3,all-week,all-day,winter,0.0907,r1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,490.5216,r1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,492.2650,r1,0,MUS$2010/Mt,2035 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 @@ -146,7 +146,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2035 fuel1,all-week,all-day,summer,1.1491,r1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.8155,r1,1,MUS$2010/PJ,2035 fuel3,all-week,all-day,summer,0.0907,r1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,492.3409,r1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,492.2650,r1,1,MUS$2010/Mt,2035 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 @@ -155,7 +155,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2035 fuel1,all-week,all-day,spring-autumn,1.1491,r1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.8155,r1,2,MUS$2010/PJ,2035 fuel3,all-week,all-day,spring-autumn,0.0907,r1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,490.5216,r1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,492.2650,r1,2,MUS$2010/Mt,2035 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 @@ -164,7 +164,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2035 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2040 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,460.5384,r1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,460.4173,r1,0,MUS$2010/Mt,2040 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 @@ -173,7 +173,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2040 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2040 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,460.4305,r1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,460.4173,r1,1,MUS$2010/Mt,2040 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 @@ -182,7 +182,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2040 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2040 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,460.5384,r1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,460.4173,r1,2,MUS$2010/Mt,2040 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 @@ -191,7 +191,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2040 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2045 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,458.3355,r1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,458.2166,r1,0,MUS$2010/Mt,2045 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 @@ -200,7 +200,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2045 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2045 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,458.2289,r1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,458.2166,r1,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 @@ -209,7 +209,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2045 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2045 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,458.3355,r1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,458.2166,r1,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 @@ -218,7 +218,7 @@ N2O,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2045 fuel1,all-week,all-day,winter,1.1404,r1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.6920,r1,0,MUS$2010/PJ,2050 fuel3,all-week,all-day,winter,0.0860,r1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,456.0445,r1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,455.9180,r1,0,MUS$2010/Mt,2050 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 @@ -227,7 +227,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2050 fuel1,all-week,all-day,summer,1.1404,r1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.6920,r1,1,MUS$2010/PJ,2050 fuel3,all-week,all-day,summer,0.0860,r1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,456.0036,r1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,455.9494,r1,1,MUS$2010/Mt,2050 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 @@ -236,7 +236,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2050 fuel1,all-week,all-day,spring-autumn,1.1404,r1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.6920,r1,2,MUS$2010/PJ,2050 fuel3,all-week,all-day,spring-autumn,0.0860,r1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,456.0445,r1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,455.9180,r1,2,MUS$2010/Mt,2050 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index 1adba9f47..771f439a3 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -6,50 +6,50 @@ CO2f,all-week,all-day,summer,r1,53628.5650,1,MUS$2010/kt,2010 ammonia,all-week,all-day,spring-autumn,r1,14.7333,2,MUS$2010/Mt,2010 CO2f,all-week,all-day,spring-autumn,r1,53628.5650,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,r1,14.9200,0,MUS$2010/Mt,2015 -CO2f,all-week,all-day,winter,r1,55365.8413,0,MUS$2010/kt,2015 +CO2f,all-week,all-day,winter,r1,55092.4480,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,r1,15.3722,1,MUS$2010/Mt,2015 CO2f,all-week,all-day,summer,r1,56761.9161,1,MUS$2010/kt,2015 ammonia,all-week,all-day,spring-autumn,r1,14.9200,2,MUS$2010/Mt,2015 -CO2f,all-week,all-day,spring-autumn,r1,55365.8413,2,MUS$2010/kt,2015 +CO2f,all-week,all-day,spring-autumn,r1,55092.4480,2,MUS$2010/kt,2015 ammonia,all-week,all-day,winter,r1,14.9200,0,MUS$2010/Mt,2020 -CO2f,all-week,all-day,winter,r1,56504.7040,0,MUS$2010/kt,2020 +CO2f,all-week,all-day,winter,r1,56197.8147,0,MUS$2010/kt,2020 ammonia,all-week,all-day,summer,r1,15.3722,1,MUS$2010/Mt,2020 CO2f,all-week,all-day,summer,r1,57900.7788,1,MUS$2010/kt,2020 ammonia,all-week,all-day,spring-autumn,r1,14.9200,2,MUS$2010/Mt,2020 -CO2f,all-week,all-day,spring-autumn,r1,56504.7040,2,MUS$2010/kt,2020 +CO2f,all-week,all-day,spring-autumn,r1,56197.8147,2,MUS$2010/kt,2020 ammonia,all-week,all-day,winter,r1,14.9309,0,MUS$2010/Mt,2025 -CO2f,all-week,all-day,winter,r1,57609.2679,0,MUS$2010/kt,2025 +CO2f,all-week,all-day,winter,r1,57270.8806,0,MUS$2010/kt,2025 ammonia,all-week,all-day,summer,r1,15.3834,1,MUS$2010/Mt,2025 CO2f,all-week,all-day,summer,r1,59006.3618,1,MUS$2010/kt,2025 ammonia,all-week,all-day,spring-autumn,r1,14.9309,2,MUS$2010/Mt,2025 -CO2f,all-week,all-day,spring-autumn,r1,57609.2679,2,MUS$2010/kt,2025 +CO2f,all-week,all-day,spring-autumn,r1,57270.8806,2,MUS$2010/kt,2025 ammonia,all-week,all-day,winter,r1,14.9418,0,MUS$2010/Mt,2030 -CO2f,all-week,all-day,winter,r1,58634.4978,0,MUS$2010/kt,2030 +CO2f,all-week,all-day,winter,r1,58266.9459,0,MUS$2010/kt,2030 ammonia,all-week,all-day,summer,r1,15.3946,1,MUS$2010/Mt,2030 CO2f,all-week,all-day,summer,r1,60032.6110,1,MUS$2010/kt,2030 ammonia,all-week,all-day,spring-autumn,r1,14.9418,2,MUS$2010/Mt,2030 -CO2f,all-week,all-day,spring-autumn,r1,58634.4978,2,MUS$2010/kt,2030 +CO2f,all-week,all-day,spring-autumn,r1,58266.9459,2,MUS$2010/kt,2030 ammonia,all-week,all-day,winter,r1,14.7240,0,MUS$2010/Mt,2035 -CO2f,all-week,all-day,winter,r1,58975.2249,0,MUS$2010/kt,2035 +CO2f,all-week,all-day,winter,r1,58588.2651,0,MUS$2010/kt,2035 ammonia,all-week,all-day,summer,r1,15.1702,1,MUS$2010/Mt,2035 CO2f,all-week,all-day,summer,r1,60363.6671,1,MUS$2010/kt,2035 ammonia,all-week,all-day,spring-autumn,r1,14.7240,2,MUS$2010/Mt,2035 -CO2f,all-week,all-day,spring-autumn,r1,58975.2249,2,MUS$2010/kt,2035 +CO2f,all-week,all-day,spring-autumn,r1,58588.2651,2,MUS$2010/kt,2035 ammonia,all-week,all-day,winter,r1,14.5061,0,MUS$2010/Mt,2040 -CO2f,all-week,all-day,winter,r1,58231.1626,0,MUS$2010/kt,2040 +CO2f,all-week,all-day,winter,r1,58214.4584,0,MUS$2010/kt,2040 ammonia,all-week,all-day,summer,r1,14.9457,1,MUS$2010/Mt,2040 CO2f,all-week,all-day,summer,r1,59978.5329,1,MUS$2010/kt,2040 ammonia,all-week,all-day,spring-autumn,r1,14.5061,2,MUS$2010/Mt,2040 -CO2f,all-week,all-day,spring-autumn,r1,58231.1626,2,MUS$2010/kt,2040 +CO2f,all-week,all-day,spring-autumn,r1,58214.4584,2,MUS$2010/kt,2040 ammonia,all-week,all-day,winter,r1,14.0973,0,MUS$2010/Mt,2045 -CO2f,all-week,all-day,winter,r1,56310.4886,0,MUS$2010/kt,2045 +CO2f,all-week,all-day,winter,r1,56294.5926,0,MUS$2010/kt,2045 ammonia,all-week,all-day,summer,r1,14.5245,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,r1,58000.4894,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,r1,14.0973,2,MUS$2010/Mt,2045 -CO2f,all-week,all-day,spring-autumn,r1,56310.4886,2,MUS$2010/kt,2045 -ammonia,all-week,all-day,winter,r1,13.6885,0,MUS$2010/Mt,2050 -CO2f,all-week,all-day,winter,r1,54395.2335,0,MUS$2010/kt,2050 +CO2f,all-week,all-day,spring-autumn,r1,56294.5926,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,r1,13.7487,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,r1,54623.1637,0,MUS$2010/kt,2050 ammonia,all-week,all-day,summer,r1,14.1033,1,MUS$2010/Mt,2050 CO2f,all-week,all-day,summer,r1,56035.9915,1,MUS$2010/kt,2050 -ammonia,all-week,all-day,spring-autumn,r1,13.6885,2,MUS$2010/Mt,2050 -CO2f,all-week,all-day,spring-autumn,r1,54395.2335,2,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,r1,13.7487,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,r1,54623.1637,2,MUS$2010/kt,2050 From 08d7ba22e933811e24813feeb1946eb04dea59fb Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 11:15:09 +0100 Subject: [PATCH 16/41] Add tests, fix errors with multi-region models Co-authored-by: Copilot --- .../1-new-region/Results/MCACapacity.csv | 150 ++++----- .../1-new-region/Results/MCAPrices.csv | 288 +++++++++--------- .../1-new-region/Results/MCASupply.csv | 252 ++++++++------- src/muse/dispatch.py | 22 +- src/muse/sectors/sector.py | 8 +- tests/test_dispatch.py | 104 ++++++- 6 files changed, 451 insertions(+), 373 deletions(-) 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 276e14f3d..5d3848f11 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 @@ -6,121 +6,95 @@ A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,5.0000,r2,2020,r2,residential,gasboiler,newcapa,2025 -A1,11.4063,r2,2025,r2,residential,gasboiler,newcapa,2025 -A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2025 +A1,19.0000,r2,2025,r2,residential,gasboiler,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2025 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2025 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2025 -A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,11.4063,r2,2025,r2,residential,gasboiler,newcapa,2030 -A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2030 -A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2030 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2025 +A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,19.0000,r2,2025,r2,residential,gasboiler,newcapa,2030 +A1,3.4062,r2,2030,r2,residential,gasboiler,newcapa,2030 +A1,7.5938,r2,2030,r2,residential,heatpump,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2030 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2030 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,7.5000,r2,2020,r2,gas,gassupply1,newcapa,2030 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2030 -A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2030 -A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2030 +A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2030 +A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 +A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,16.0000,r2,2035,r2,residential,gasboiler,newcapa,2035 -A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2035 -A1,9.0000,r2,2035,r2,residential,heatpump,newcapa,2035 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.4062,r2,2030,r2,residential,gasboiler,newcapa,2035 +A1,12.5938,r2,2035,r2,residential,gasboiler,newcapa,2035 +A1,7.5938,r2,2030,r2,residential,heatpump,newcapa,2035 +A1,12.4062,r2,2035,r2,residential,heatpump,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2035 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2035 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2035 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2035 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2035 -A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2035 -A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2035 +A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2035 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2035 +A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,16.0000,r2,2035,r2,residential,gasboiler,newcapa,2040 -A1,6.0000,r2,2040,r2,residential,gasboiler,newcapa,2040 -A1,9.0000,r2,2035,r2,residential,heatpump,newcapa,2040 -A1,11.0000,r2,2040,r2,residential,heatpump,newcapa,2040 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,12.5938,r2,2035,r2,residential,gasboiler,newcapa,2040 +A1,9.4062,r2,2040,r2,residential,gasboiler,newcapa,2040 +A1,12.4062,r2,2035,r2,residential,heatpump,newcapa,2040 +A1,7.5938,r2,2040,r2,residential,heatpump,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2040 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2040 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2040 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2040 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2040 -A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2040 -A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2040 -A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2040 +A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2040 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2040 +A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2040 +A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,6.0000,r2,2040,r2,residential,gasboiler,newcapa,2045 -A1,22.0000,r2,2045,r2,residential,gasboiler,newcapa,2045 -A1,11.0000,r2,2040,r2,residential,heatpump,newcapa,2045 -A1,9.0000,r2,2045,r2,residential,heatpump,newcapa,2045 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,9.4062,r2,2040,r2,residential,gasboiler,newcapa,2045 +A1,18.5938,r2,2045,r2,residential,gasboiler,newcapa,2045 +A1,7.5938,r2,2040,r2,residential,heatpump,newcapa,2045 +A1,12.4062,r2,2045,r2,residential,heatpump,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2045 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2045 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2045 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2045 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2045 -A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2045 -A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2045 -A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2045 +A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2045 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2045 +A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2045 +A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2045 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,22.0000,r2,2045,r2,residential,gasboiler,newcapa,2050 -A1,12.0000,r2,2050,r2,residential,gasboiler,newcapa,2050 -A1,9.0000,r2,2045,r2,residential,heatpump,newcapa,2050 -A1,11.0000,r2,2050,r2,residential,heatpump,newcapa,2050 -A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 -A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,18.5938,r2,2045,r2,residential,gasboiler,newcapa,2050 +A1,15.4062,r2,2050,r2,residential,gasboiler,newcapa,2050 +A1,12.4062,r2,2045,r2,residential,heatpump,newcapa,2050 +A1,7.5938,r2,2050,r2,residential,heatpump,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 +A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 +A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2050 -A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2050 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2050 -A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2050 -A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,3.5838,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,6.1458,r2,2025,r2,gas,gassupply1,newcapa,2050 -A1,1.0556,r2,2030,r2,gas,gassupply1,newcapa,2050 -A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2050 -A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2050 +A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2050 +A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2050 +A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2050 +A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2050,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 b7ee17c09..ea2bc3af1 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 @@ -59,363 +59,363 @@ gas,all-week,evening,all-year,7.1528,r2,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.2688,r2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.7895,r2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.8409,r2,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,27.2267,r2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.7895,r2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.8409,r2,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.2688,r2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.7895,r2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.8409,r2,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,27.2267,r2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.7895,r2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.8409,r2,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,27.1846,r2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.7895,r2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.8409,r2,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.2056,r2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.7895,r2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.8409,r2,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,21.6253,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.3817,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.9998,r2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.6487,r2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.1084,r2,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,22.1149,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.5031,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.9998,r2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.6487,r2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.1084,r2,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,21.6253,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.3817,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.9998,r2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.6487,r2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.1084,r2,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,22.1149,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.5031,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.9998,r2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.6487,r2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.1084,r2,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,33.8719,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,15.4178,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.9998,r2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.6487,r2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.1084,r2,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,25.4663,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.3339,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.9998,r2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.6487,r2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1084,r2,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,26.9455,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.3756,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.4773,r2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.7488,r2,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,27.2811,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,13.5099,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.4773,r2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.9251,r2,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,26.9455,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.3756,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.4773,r2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.7488,r2,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,27.2811,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,13.5099,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.4773,r2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.9251,r2,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,36.6832,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,17.2707,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.4773,r2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.7812,r2,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,30.5891,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.8331,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.4773,r2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.8531,r2,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,32.2513,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.4979,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.9389,r2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,14.6002,r2,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,32.5869,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,15.6322,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.9389,r2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.6085,r2,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,32.2513,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.4979,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.9389,r2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,14.6002,r2,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,32.5869,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,15.6322,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.9389,r2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.6085,r2,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,44.3086,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,20.3209,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,16.9389,r2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.1994,r2,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,34.9664,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.5840,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.9389,r2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.4039,r2,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,39.6941,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.4751,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,20.6015,r2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.5551,r2,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,40.0297,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,18.6093,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,20.6015,r2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,19.4373,r2,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,39.6941,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.4751,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,20.6015,r2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.5551,r2,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,40.0297,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,18.6093,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,20.6015,r2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,19.4373,r2,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,49.8091,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,22.5210,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,20.6015,r2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,20.8294,r2,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,41.1067,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,19.0401,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,20.6015,r2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,20.1334,r2,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,47.1369,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,21.4522,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,7.4491,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,night,all-year,22.7024,r2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,24.6177,r2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,22.7987,r2,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,47.4725,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.5864,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.6562,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,22.7024,r2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,24.6177,r2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.5829,r2,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,47.1369,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,21.4522,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,7.4491,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,22.7024,r2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,24.6177,r2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,22.7987,r2,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,47.4725,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.5864,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.6562,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,22.7024,r2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,24.6177,r2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.5829,r2,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,53.5725,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,24.0264,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.0961,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,22.7024,r2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,24.6177,r2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,24.8203,r2,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,47.2470,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.4962,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.9090,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,22.7024,r2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,24.6177,r2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,24.2016,r2,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv index 90e5f6921..f561a8086 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv @@ -35,255 +35,243 @@ CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 gas,all-week,evening,all-year,r2,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r2,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r2,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 -gas,all-week,night,all-year,r2,1.0573,0,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 +gas,all-week,night,all-year,r2,1.5467,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r2,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r2,58.9805,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r2,86.2800,0,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r2,1.5859,1,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 +gas,all-week,morning,all-year,r2,2.3200,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r2,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r2,88.4707,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r2,129.4200,1,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r2,1.0573,2,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 +gas,all-week,afternoon,all-year,r2,1.5467,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r2,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r2,58.9805,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r2,86.2800,2,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r2,1.5859,3,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 +gas,all-week,early-peak,all-year,r2,2.3200,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r2,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r2,88.4707,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r2,129.4200,3,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r2,3.1719,4,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 +gas,all-week,late-peak,all-year,r2,4.6400,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r2,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r2,176.9414,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r2,258.8400,4,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r2,2.1146,5,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 +gas,all-week,evening,all-year,r2,3.0933,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r2,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r2,117.9609,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4251,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r2,172.5600,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,78.8830,0,MUS$2010/kt,2030 -gas,all-week,night,all-year,r2,0.7351,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r2,0.1687,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r2,1.4440,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r2,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r2,41.0055,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1377,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r2,80.5505,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,118.3245,1,MUS$2010/kt,2030 -gas,all-week,morning,all-year,r2,1.1026,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r2,0.2531,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r2,2.1659,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r2,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r2,61.5082,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4251,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r2,120.8257,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,78.8830,2,MUS$2010/kt,2030 -gas,all-week,afternoon,all-year,r2,0.7351,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r2,0.1687,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r2,1.4440,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r2,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r2,41.0055,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1377,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r2,80.5505,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,118.3245,3,MUS$2010/kt,2030 -gas,all-week,early-peak,all-year,r2,1.1026,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r2,0.2531,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r2,2.1659,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r2,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r2,61.5082,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r2,120.8257,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 -gas,all-week,late-peak,all-year,r2,2.2052,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r2,0.5062,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r2,4.3319,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r2,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r2,123.0164,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.6948,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r2,241.6514,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,149.2356,5,MUS$2010/kt,2030 -gas,all-week,evening,all-year,r2,1.4701,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r2,0.3375,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r2,2.8879,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r2,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r2,82.0109,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r2,161.1009,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 +electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,r2,1.0311,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r2,2.0000,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,r2,57.5200,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,r2,1.5467,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r2,3.0000,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,r2,86.2800,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,r2,1.0311,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r2,2.0000,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,r2,57.5200,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,r2,1.5467,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r2,3.0000,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,r2,86.2800,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.3333,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,r2,3.0933,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r2,6.0000,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,r2,172.5600,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,r2,2.0622,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r2,4.0000,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,r2,115.0400,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2040 +electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,r2,1.4178,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r2,2.3333,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,r2,79.0900,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,r2,2.1267,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r2,3.5000,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,r2,118.6350,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2040 +electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,r2,1.4178,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r2,2.3333,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,r2,79.0900,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,r2,2.1267,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r2,3.5000,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,r2,118.6350,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r1,1.7333,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,r2,4.2533,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r2,7.0000,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,r2,237.2700,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,r2,2.8356,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r2,4.6667,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,r2,158.1800,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2045 +electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,r2,1.8044,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r2,2.6667,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,r2,100.6600,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2045 +electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,r2,2.7067,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r2,4.0000,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,r2,150.9900,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2045 +electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,r2,1.8044,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r2,2.6667,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,r2,100.6600,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2045 +electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,r2,2.7067,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r2,4.0000,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,r2,150.9900,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r1,2.1333,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 +electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,r2,5.4133,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r2,8.0000,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,r2,301.9800,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2045 +electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,r2,3.6089,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r2,5.3333,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,r2,201.3200,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,r1,0.4444,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.7422,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,40.7422,0,MUS$2010/kt,2050 +electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,r2,2.1911,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r2,3.0000,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,r2,122.2300,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,r1,0.6667,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,1.1133,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,61.1133,1,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,r2,3.2867,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r2,4.5000,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,r2,183.3450,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,r1,0.4444,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.7422,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,40.7422,2,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,r2,2.1911,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r2,3.0000,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,r2,122.2300,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,r1,0.6667,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,1.1133,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,61.1133,3,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,r2,3.2867,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r2,4.5000,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,r2,183.3450,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,r1,2.5333,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,r2,6.5733,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r2,9.0000,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,r2,366.6900,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,r1,0.8889,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,1.2247,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,67.2247,5,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,r2,4.3822,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r2,6.0000,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,r2,244.4600,5,MUS$2010/kt,2050 diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 69464479b..e0a26b936 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -34,6 +34,7 @@ def production( __all__ = [ "PRODUCTION_SIGNATURE", + "dispatch_by_merit_order", "factory", "maximum_production", "merit_order_production", @@ -231,9 +232,19 @@ def merit_order_production( maximum_production, minimum_production, ) + from muse.utilities import broadcast_over_assets assert "asset" not in demand.dims assert "asset" in capacity.dims + assert "asset" not in prices.dims + + # Normalise demand/prices dataarrays to ensure they have a region dimension + if "region" not in demand.dims: + region = np.unique(technologies.region.values).item() + demand = demand.expand_dims(region=[region]) + if "region" not in prices.dims: + region = np.unique(technologies.region.values).item() + prices = prices.expand_dims(region=[region]) # Maximum and minimum production for each asset maxprod = maximum_production( @@ -245,7 +256,10 @@ def merit_order_production( # Consumption of each asset assuming full dispatch, for calculating costs later on. maxcons = consumption( - technologies, maxprod, prices=prices, timeslice_level=timeslice_level + technologies, + maxprod, + prices=broadcast_over_assets(prices, capacity, installed_as_year=False), + timeslice_level=timeslice_level, ) # Set capital costs and fixed costs to zero so they're not included in the @@ -264,15 +278,15 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - maxprod_region = maxprod_y.where(maxprod_y.region == region, drop=True) - region_assets = maxprod_region.asset + region_assets = maxprod_y.asset.isel(asset=(maxprod_y.region == region)) + maxprod_region = maxprod_y.sel(asset=region_assets) techs_region = technologies.sel(asset=region_assets) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. technology_costs = levelized_cost_of_energy( techs_region, - prices_y.where(prices_y.region == region, drop=True), + prices_y.sel(region=region), capacity_y.sel(asset=region_assets), production=maxprod_region, consumption=maxcons_y.sel(asset=region_assets), diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index eb6395e54..b429523d2 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -286,18 +286,18 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: technologies, capacity, installed_as_year=True ) - # Select relevant prices for each asset - prices = broadcast_over_assets(market.prices, capacity, installed_as_year=False) - # Calculate supply supply = self.supply_prod( demand=market.consumption, capacity=capacity, technologies=technodata, timeslice_level=self.timeslice_level, - prices=prices, + prices=market.prices, ) + # Select relevant prices for each asset + prices = broadcast_over_assets(market.prices, capacity, installed_as_year=False) + # Calculate consumption consume = consumption( technologies=technodata, diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index c5f461bef..3d9750d57 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -25,6 +25,34 @@ def production( ) +@fixture +def prices( + technologies: xr.Dataset, capacity: xr.DataArray, timeslice: xr.DataArray +) -> xr.DataArray: + # Make random prices for all commodities/timeslices/years/regions + regions = regions = xr.DataArray( + capacity["region"].to_index().unique(), + dims="region", + name="region", + ) + prices_by_region = xr.DataArray( + np.random.rand( + technologies.sizes["commodity"], + timeslice.sizes["timeslice"], + capacity.sizes["year"], + regions.size, + ), + coords={ + "commodity": technologies.coords["commodity"], + "timeslice": timeslice.coords["timeslice"], + "year": capacity.coords["year"], + "region": regions, + }, + dims=("commodity", "timeslice", "year", "region"), + ) + return prices_by_region + + def test_share_based_supply_single_region( technologies: xr.Dataset, capacity: xr.DataArray, @@ -49,6 +77,33 @@ def test_share_based_supply_single_region( assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 +def test_merit_order_supply_single_region( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + prices: xr.DataArray, + timeslice, +): + from muse.dispatch import merit_order_production + + # Setup single region data + region = "USA" + technologies = technologies.where(technologies.region == region, drop=True) + capacity = capacity.where(capacity.region == region, drop=True) + production = production.where(production.region == region, drop=True) + + # Create random demand + demand = production.sum("asset") * np.random.rand(*production.sum("asset").shape) + assert "region" not in demand.dims + + # Test supply matches demand for end-use commodities + spl = merit_order_production(demand, capacity, technologies, prices=prices).sum( + "asset" + ) + enduses = is_enduse(technologies.comm_usage) + assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 + + def test_share_based_supply_multi_region( technologies: xr.Dataset, capacity: xr.DataArray, @@ -72,6 +127,30 @@ def test_share_based_supply_multi_region( assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 +def test_merit_order_supply_multi_region( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + prices: xr.DataArray, + timeslice, +): + from muse.dispatch import merit_order_production + + # Create random demand + demand = production.groupby("region").sum("asset") + demand = demand * np.random.rand(*demand.shape) + assert "region" in demand.dims + + # Test supply matches demand for end-use commodities by region + spl = ( + merit_order_production(demand, capacity, technologies, prices=prices) + .groupby("region") + .sum("asset") + ) + enduses = is_enduse(technologies.comm_usage) + assert abs(spl.sel(commodity=enduses) - demand.sel(commodity=enduses)).sum() < 1e-5 + + def test_share_based_supply_with_min_service( technologies: xr.Dataset, capacity: xr.DataArray, @@ -93,7 +172,30 @@ def test_share_based_supply_with_min_service( assert (spl >= minprod).all() -def test_merit_order_dispatch(): +def test_merit_order_supply_with_min_service( + technologies: xr.Dataset, + capacity: xr.DataArray, + production: xr.DataArray, + prices: xr.DataArray, + timeslice, +): + from muse.dispatch import merit_order_production + from muse.quantities import minimum_production + + technologies["minimum_service_factor"] = 0.3 + minprod = minimum_production(technologies, capacity) + + # Create random demand + demand = production.groupby("region").sum("asset") + demand = demand * np.random.rand(*demand.shape) + + # Test supply meets minimum production constraint + spl = merit_order_production(demand, capacity, technologies, prices=prices) + assert (spl >= minprod).all() + + +def test_dispatch_by_merit_order(): + """Follows the example in the docstring of `dispatch_by_merit_order`.""" from muse.dispatch import dispatch_by_merit_order demand = xr.DataArray( From fc62b8b10b25e5e2fc69384a70063ab53a39a7c8 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 11:49:03 +0100 Subject: [PATCH 17/41] Use different mask Co-authored-by: Copilot --- src/muse/dispatch.py | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index e0a26b936..edb2ad473 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -239,6 +239,7 @@ def merit_order_production( assert "asset" not in prices.dims # Normalise demand/prices dataarrays to ensure they have a region dimension + # Multi-region models will already have a region dimension if "region" not in demand.dims: region = np.unique(technologies.region.values).item() demand = demand.expand_dims(region=[region]) @@ -262,10 +263,17 @@ def merit_order_production( timeslice_level=timeslice_level, ) + # Verify all asset-level inputs are positionally aligned before using isel. + xr.align( + technologies, capacity, maxprod, minprod, maxcons, join="exact", copy=False + ) + # Set capital costs and fixed costs to zero so they're not included in the # cost-minimisation - technologies = technologies.assign(cap_par=xr.zeros_like(technologies.cap_par)) - technologies = technologies.assign(fix_par=xr.zeros_like(technologies.fix_par)) + technologies = technologies.assign( + cap_par=xr.zeros_like(technologies.cap_par), + fix_par=xr.zeros_like(technologies.fix_par), + ) # Initialise result with zeros result = xr.zeros_like(maxprod) @@ -278,26 +286,28 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - region_assets = maxprod_y.asset.isel(asset=(maxprod_y.region == region)) - maxprod_region = maxprod_y.sel(asset=region_assets) - techs_region = technologies.sel(asset=region_assets) + region_mask = np.broadcast_to( + maxprod_y.region.values == region, maxprod_y.sizes["asset"] + ) + maxprod_region = maxprod_y.isel(asset=region_mask) + techs_region = technologies.isel(asset=region_mask) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. technology_costs = levelized_cost_of_energy( techs_region, prices_y.sel(region=region), - capacity_y.sel(asset=region_assets), + capacity_y.isel(asset=region_mask), production=maxprod_region, - consumption=maxcons_y.sel(asset=region_assets), + consumption=maxcons_y.isel(asset=region_mask), ) - minprod_region = minprod_y.sel(asset=region_assets) + minprod_region = minprod_y.isel(asset=region_mask) # Calculate production for this year by dispatching assets in order of # increasing cost until demand is met for ts in maxprod.timeslice.values: - result.loc[dict(year=y, timeslice=ts, asset=region_assets.values)] = ( + result.loc[dict(year=y, timeslice=ts, asset=region_mask)] = ( dispatch_by_merit_order( demand=demand.sel(year=y, timeslice=ts, region=region), minprod=minprod_region.sel(timeslice=ts), From 99889e70dbd789b1c5ec1341b2ce9d70e03f5fad Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 11:50:31 +0100 Subject: [PATCH 18/41] Fix documentation formatting Co-authored-by: Copilot --- docs/inputs/toml.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index bc9637250..615fa3a13 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -221,16 +221,16 @@ A sector accepts these attributes: MUSE provides three methods in :py:mod:`muse.dispatch`: * **share**: assets each supply a proportion of demand based on their share of total capacity. - This method is most appropriate for sectors where demand is inherently distributed across assets and cannot be shifted between them - (e.g. residential heating systems, where assets in each household meets their own share of the demand). - See :py:func:`muse.dispatch.share_based_production`. + This method is most appropriate for sectors where demand is inherently distributed across assets and cannot be shifted between them + (e.g. residential heating systems, where assets in each household meets their own share of the demand). + See :py:func:`muse.dispatch.share_based_production`. * **merit-order**: supply in each timeslice is obtained by dispatching the cheapest assets first until the demand is met. - See :py:func:`muse.dispatch.merit_order_production`. - This method is best suited to sectors where supply is pooled across assets and short-run marginal cost is the dominant driver of dispatch decisions - (e.g. electricity production). + This method is best suited to sectors where supply is pooled across assets and short-run marginal cost is the dominant driver of dispatch decisions + (e.g. electricity production). + See :py:func:`muse.dispatch.merit_order_production`. * **maximum**: the production is the maximum production for the existing capacity and the technology's utilization factor. - This is largely intended for testing purposes. - See :py:func:`muse.dispatch.maximum_production`. + This is largely intended for testing purposes. + See :py:func:`muse.dispatch.maximum_production`. Additional methods can be registered with :py:func:`muse.dispatch.register_dispatch` From e021235644887c8320e57574cfbe7cd856e05435 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 12:49:19 +0100 Subject: [PATCH 19/41] Normalise some data inputs --- docs/inputs/toml.rst | 2 +- src/muse/dispatch.py | 33 ++++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index 615fa3a13..f5cc7b845 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -232,7 +232,7 @@ A sector accepts these attributes: This is largely intended for testing purposes. See :py:func:`muse.dispatch.maximum_production`. - Additional methods can be registered with :py:func:`muse.dispatch.register_dispatch` + Additional methods can be registered with :py:func:`muse.dispatch.register_production` ``technodata`` Path to a csv file containing the characterization of the technologies involved in diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index edb2ad473..f2719dc52 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -247,6 +247,18 @@ def merit_order_production( region = np.unique(technologies.region.values).item() prices = prices.expand_dims(region=[region]) + # Normalise technologies/capacity dataarrays to ensure that the region coordinate is + # aligned with the asset coordinate + # This will already be the case for multi-region models + if "asset" not in technologies.region.dims: + technologies = technologies.assign_coords( + region=("asset", [technologies.region.item()] * technologies.sizes["asset"]) + ) + if "asset" not in capacity.region.dims: + capacity = capacity.assign_coords( + region=("asset", [capacity.region.item()] * capacity.sizes["asset"]) + ) + # Maximum and minimum production for each asset maxprod = maximum_production( technologies, capacity, timeslice_level=timeslice_level @@ -286,28 +298,27 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - region_mask = np.broadcast_to( - maxprod_y.region.values == region, maxprod_y.sizes["asset"] - ) - maxprod_region = maxprod_y.isel(asset=region_mask) - techs_region = technologies.isel(asset=region_mask) + region_assets = maxprod_y.get_index("asset")[ + maxprod_y.region.values == region + ] + maxprod_region = maxprod_y.sel(asset=region_assets) + techs_region = technologies.sel(asset=region_assets) + minprod_region = minprod_y.sel(asset=region_assets) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. technology_costs = levelized_cost_of_energy( techs_region, prices_y.sel(region=region), - capacity_y.isel(asset=region_mask), + capacity_y.sel(asset=region_assets), production=maxprod_region, - consumption=maxcons_y.isel(asset=region_mask), + consumption=maxcons_y.sel(asset=region_assets), ) - minprod_region = minprod_y.isel(asset=region_mask) - # Calculate production for this year by dispatching assets in order of # increasing cost until demand is met - for ts in maxprod.timeslice.values: - result.loc[dict(year=y, timeslice=ts, asset=region_mask)] = ( + for ts in maxprod_y.timeslice.values: + result.loc[dict(year=y, timeslice=ts, asset=region_assets)] = ( dispatch_by_merit_order( demand=demand.sel(year=y, timeslice=ts, region=region), minprod=minprod_region.sel(timeslice=ts), From 2a070d7b35c20a8712f03e7d4eee377da8d4a524 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 12:55:17 +0100 Subject: [PATCH 20/41] Typo --- tests/test_dispatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 3d9750d57..be84ac523 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -30,7 +30,7 @@ def prices( technologies: xr.Dataset, capacity: xr.DataArray, timeslice: xr.DataArray ) -> xr.DataArray: # Make random prices for all commodities/timeslices/years/regions - regions = regions = xr.DataArray( + regions = xr.DataArray( capacity["region"].to_index().unique(), dims="region", name="region", From d3970d125eb5f3cabd9757fd7590c390dbbb9989 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 13:26:34 +0100 Subject: [PATCH 21/41] Create dedicated marginal_cost function --- src/muse/costs.py | 64 +++++- src/muse/dispatch.py | 11 +- .../Results/Power_Supply.csv | 192 +++++++++--------- tests/test_costs.py | 21 ++ 4 files changed, 181 insertions(+), 107 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index a4d755676..e858961da 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -191,10 +191,12 @@ def running_costs( production: xr.DataArray, consumption: xr.DataArray, aggregate_timeslices: bool = False, + include_fixed_costs: bool = True, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). - This is the sum of environmental, fuel, material, fixed and variable costs. + This is the sum of environmental, fuel, material, variable and (optionally) fixed + costs. .. seealso:: :py:func:`environmental_costs` @@ -215,8 +217,11 @@ def running_costs( _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) + if include_fixed_costs: + _fixed_costs = fixed_costs(technologies, capacity) + else: + _fixed_costs = xr.zeros_like(_variable_costs) # Split fixed/variable across timeslices in proportion to production (if required) if not aggregate_timeslices: @@ -496,6 +501,61 @@ def levelized_cost_of_energy( return result +@cost +def marginal_cost( + technologies: xr.Dataset, + prices: xr.DataArray, + capacity: xr.DataArray, + production: xr.DataArray, + consumption: xr.DataArray, + aggregate_timeslices: bool = False, +) -> xr.DataArray: + """Marginal cost of technologies. + + The average cost of producing one unit of output, excluding capital costs and fixed + costs. + + Arguments: + technologies: xr.Dataset of technology parameters + prices: xr.DataArray with commodity prices + capacity: xr.DataArray with the capacity of the relevant technologies + 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 marginal costs calculated for the relevant technologies + """ + # Running costs (annual) + _running_costs = running_costs( + technologies, + prices, + capacity, + production, + consumption, + aggregate_timeslices, + include_fixed_costs=False, + ) + + # Production (annual) + products = is_enduse(technologies.comm_usage) + prod = ( + production.where(production > 0.0, 1e-6) + .sel(commodity=products) + .sum( + "commodity" + ) # TODO: is this the correct way to deal with multiple products? + ) + if aggregate_timeslices: + prod = prod.sum("timeslice") + + # LCOE + result = _running_costs / prod + return result + + def supply_cost( production: xr.DataArray, lcoe: xr.DataArray, asset_dim: str | None = "asset" ) -> xr.DataArray: diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index f2719dc52..9edf03374 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -225,7 +225,7 @@ def merit_order_production( timeslice/year/region, see the docstring of :py:func:`dispatch_by_merit_order`. """ from muse.commodities import CommodityUsage, check_usage, is_pollutant - from muse.costs import levelized_cost_of_energy + from muse.costs import marginal_cost from muse.quantities import ( consumption, emission, @@ -280,13 +280,6 @@ def merit_order_production( technologies, capacity, maxprod, minprod, maxcons, join="exact", copy=False ) - # Set capital costs and fixed costs to zero so they're not included in the - # cost-minimisation - technologies = technologies.assign( - cap_par=xr.zeros_like(technologies.cap_par), - fix_par=xr.zeros_like(technologies.fix_par), - ) - # Initialise result with zeros result = xr.zeros_like(maxprod) @@ -307,7 +300,7 @@ def merit_order_production( # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. - technology_costs = levelized_cost_of_energy( + technology_costs = marginal_cost( techs_region, prices_y.sel(region=region), capacity_y.sel(asset=region_assets), diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 29feab453..7ebd1ad89 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,96 +1,96 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.1708,windturbine,5,2025 -1,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2030 -2,electricity,all-week,night,2030,all-year,r1,0.0736,windturbine,0,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.2802,windturbine,1,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.0736,windturbine,2,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.2802,windturbine,3,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.4868,windturbine,5,2030 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2035 -1,electricity,all-week,night,2030,all-year,r1,0.4604,windturbine,0,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.8604,windturbine,1,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.4604,windturbine,2,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.8604,windturbine,3,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2040 -1,electricity,all-week,night,2030,all-year,r1,0.5937,windturbine,0,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.5937,windturbine,2,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2045 -1,electricity,all-week,night,2030,all-year,r1,0.7271,windturbine,0,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.7271,windturbine,2,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 -1,electricity,all-week,night,2030,all-year,r1,0.9000,windturbine,0,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3000,windturbine,0,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.9000,windturbine,1,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.9000,windturbine,2,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3000,windturbine,2,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.9000,windturbine,3,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2050 -2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.3396,windturbine,5,2050 +asset,commodity,day,hour,installed,month,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,0.1667,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,15.2783,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,0.1667,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,15.2783,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,0.1708,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2030 +2,electricity,all-week,night,2030,all-year,0.0736,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,0.2802,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2030 +2,electricity,all-week,afternoon,2030,all-year,0.0736,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,0.2802,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,0.4868,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,0.4604,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,0.8604,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,0.4604,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,0.8604,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,0.5937,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,0.5937,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,0.7271,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,0.7271,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,0.9000,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,0.3000,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,0.9000,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,0.9000,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,0.3000,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,0.9000,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,0.7396,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,0.3396,windturbine,5,2050 diff --git a/tests/test_costs.py b/tests/test_costs.py index f66237b04..7c3909544 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -11,6 +11,7 @@ fixed_costs, fuel_costs, levelized_cost_of_energy, + marginal_cost, material_costs, net_present_cost, net_present_value, @@ -152,6 +153,11 @@ def test_levelized_cost_of_energy( assert set(result.dims) == {"asset", "timeslice"} +def test_marginal_cost(_technologies, _prices, _capacity, _production, _consumption): + result = marginal_cost(_technologies, _prices, _capacity, _production, _consumption) + assert set(result.dims) == {"asset", "timeslice"} + + def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): lcoe = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method="annual" @@ -305,6 +311,21 @@ def test_lcoe_aggregate( assert set(result.dims) == {"asset"} +def test_marginal_cost_aggregate( + _technologies, _prices, _capacity, _production, _consumption +): + """Test marginal cost aggregation over timeslices.""" + result = marginal_cost( + _technologies, + _prices, + _capacity, + _production, + _consumption, + aggregate_timeslices=True, + ) + assert set(result.dims) == {"asset"} + + def test_npv_aggregate(_technologies, _prices, _capacity, _production, _consumption): """Test NPV aggregation over timeslices.""" result = net_present_value( From b80d991f8833a6e61a46b949435b0046f3ef3549 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 14:24:29 +0100 Subject: [PATCH 22/41] Simplify marginal cost calculation --- src/muse/costs.py | 40 +++++++++++++++------------------------- src/muse/dispatch.py | 2 -- tests/test_costs.py | 19 ++----------------- 3 files changed, 17 insertions(+), 44 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index e858961da..d26ca8c82 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -191,7 +191,6 @@ def running_costs( production: xr.DataArray, consumption: xr.DataArray, aggregate_timeslices: bool = False, - include_fixed_costs: bool = True, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). @@ -218,10 +217,7 @@ def running_costs( # Costs associated with capacity and production level (annual) _variable_costs = variable_costs(technologies, production) - if include_fixed_costs: - _fixed_costs = fixed_costs(technologies, capacity) - else: - _fixed_costs = xr.zeros_like(_variable_costs) + _fixed_costs = fixed_costs(technologies, capacity) # Split fixed/variable across timeslices in proportion to production (if required) if not aggregate_timeslices: @@ -505,10 +501,8 @@ def levelized_cost_of_energy( def marginal_cost( technologies: xr.Dataset, prices: xr.DataArray, - capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - aggregate_timeslices: bool = False, ) -> xr.DataArray: """Marginal cost of technologies. @@ -522,24 +516,22 @@ def marginal_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 marginal costs calculated for the relevant technologies """ - # Running costs (annual) - _running_costs = running_costs( - technologies, - prices, - capacity, - production, - consumption, - aggregate_timeslices, - include_fixed_costs=False, - ) - - # Production (annual) + # Environmental, fuel and material costs + env = environmental_costs(technologies, prices, production) + fuel = fuel_costs(technologies, prices, consumption) + material = material_costs(technologies, prices, consumption) + + # Variable costs + tech_activity = production_amplitude(production, technologies) + var = broadcast_timeslice( + technologies.var_par + ) * tech_activity ** broadcast_timeslice(technologies.var_exp) + + # Production products = is_enduse(technologies.comm_usage) prod = ( production.where(production > 0.0, 1e-6) @@ -548,11 +540,9 @@ def marginal_cost( "commodity" ) # TODO: is this the correct way to deal with multiple products? ) - if aggregate_timeslices: - prod = prod.sum("timeslice") - # LCOE - result = _running_costs / prod + # Marginal cost + result = (env + fuel + material + var) / prod return result diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 9edf03374..ca657e499 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -285,7 +285,6 @@ def merit_order_production( for y in maxprod.year.values: prices_y = prices.sel(year=y) - capacity_y = capacity.sel(year=y) maxprod_y = maxprod.sel(year=y) minprod_y = minprod.sel(year=y) maxcons_y = maxcons.sel(year=y) @@ -303,7 +302,6 @@ def merit_order_production( technology_costs = marginal_cost( techs_region, prices_y.sel(region=region), - capacity_y.sel(asset=region_assets), production=maxprod_region, consumption=maxcons_y.sel(asset=region_assets), ) diff --git a/tests/test_costs.py b/tests/test_costs.py index 7c3909544..3165ad7a0 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -153,8 +153,8 @@ def test_levelized_cost_of_energy( assert set(result.dims) == {"asset", "timeslice"} -def test_marginal_cost(_technologies, _prices, _capacity, _production, _consumption): - result = marginal_cost(_technologies, _prices, _capacity, _production, _consumption) +def test_marginal_cost(_technologies, _prices, _production, _consumption): + result = marginal_cost(_technologies, _prices, _production, _consumption) assert set(result.dims) == {"asset", "timeslice"} @@ -311,21 +311,6 @@ def test_lcoe_aggregate( assert set(result.dims) == {"asset"} -def test_marginal_cost_aggregate( - _technologies, _prices, _capacity, _production, _consumption -): - """Test marginal cost aggregation over timeslices.""" - result = marginal_cost( - _technologies, - _prices, - _capacity, - _production, - _consumption, - aggregate_timeslices=True, - ) - assert set(result.dims) == {"asset"} - - def test_npv_aggregate(_technologies, _prices, _capacity, _production, _consumption): """Test NPV aggregation over timeslices.""" result = net_present_value( From 3b7fc0efaeed4f205a950c6e8a415677f5c412e0 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 14:36:41 +0100 Subject: [PATCH 23/41] Update results files --- .../1-min-constraint/Results/Power_Supply.csv | 216 +++++++++--------- .../2-max-constraint/Results/Power_Supply.csv | 206 ++++++++--------- 2 files changed, 211 insertions(+), 211 deletions(-) diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 8f2a29e27..3bbdabe93 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -1,108 +1,108 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,2020 -0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,2020 -0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,2020 -0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,2020 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,2020 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,2020 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1333,gasCCGT,4,2020 -0,CO2f,all-week,late-peak,2020,all-year,r1,12.2227,gasCCGT,4,2020 -0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2020 -0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2020 -0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.1667,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,r1,15.2783,gasCCGT,5,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.1708,windturbine,5,2025 -1,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2030 -2,electricity,all-week,night,2030,all-year,r1,0.0736,windturbine,0,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.2802,windturbine,1,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.0736,windturbine,2,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.2802,windturbine,3,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.4868,windturbine,5,2030 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2035 -1,electricity,all-week,night,2030,all-year,r1,0.4604,windturbine,0,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.8604,windturbine,1,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.4604,windturbine,2,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.8604,windturbine,3,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2040 -1,electricity,all-week,night,2030,all-year,r1,0.5937,windturbine,0,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.5937,windturbine,2,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 -0,electricity,all-week,night,2025,all-year,r1,0.3396,windturbine,0,2045 -1,electricity,all-week,night,2030,all-year,r1,0.7271,windturbine,0,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.3396,windturbine,1,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.3396,windturbine,2,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.7271,windturbine,2,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.3396,windturbine,3,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.3396,windturbine,5,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 -1,electricity,all-week,night,2030,all-year,r1,0.9000,windturbine,0,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3000,windturbine,0,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.9000,windturbine,1,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.9000,windturbine,1,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.9000,windturbine,2,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3000,windturbine,2,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.9000,windturbine,3,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.9000,windturbine,3,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.9000,windturbine,5,2050 -2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.3396,windturbine,5,2050 +asset,commodity,day,hour,installed,month,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,0.0333,gasCCGT,0,2020 +0,CO2f,all-week,night,2020,all-year,3.0557,gasCCGT,0,2020 +0,electricity,all-week,morning,2020,all-year,0.0667,gasCCGT,1,2020 +0,CO2f,all-week,morning,2020,all-year,6.1113,gasCCGT,1,2020 +0,electricity,all-week,afternoon,2020,all-year,0.1000,gasCCGT,2,2020 +0,CO2f,all-week,afternoon,2020,all-year,9.1670,gasCCGT,2,2020 +0,electricity,all-week,early-peak,2020,all-year,0.0667,gasCCGT,3,2020 +0,CO2f,all-week,early-peak,2020,all-year,6.1113,gasCCGT,3,2020 +0,electricity,all-week,late-peak,2020,all-year,0.1333,gasCCGT,4,2020 +0,CO2f,all-week,late-peak,2020,all-year,12.2227,gasCCGT,4,2020 +0,electricity,all-week,evening,2020,all-year,0.1667,gasCCGT,5,2020 +0,CO2f,all-week,evening,2020,all-year,15.2783,gasCCGT,5,2020 +0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,0.1667,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,15.2783,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,0.1667,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,15.2783,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,0.1708,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2030 +2,electricity,all-week,night,2030,all-year,0.0736,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,0.2802,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2030 +2,electricity,all-week,afternoon,2030,all-year,0.0736,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,0.2802,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,0.4868,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,0.4604,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,0.8604,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,0.4604,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,0.8604,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,0.5937,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,0.5937,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,0.7271,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,0.7271,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,0.9000,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,0.3000,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,0.9000,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,0.9000,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,0.3000,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,0.9000,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,0.7396,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,0.3396,windturbine,5,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 7a50404ae..f663fab80 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -1,103 +1,103 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,r1,0.0333,gasCCGT,0,2020 -0,CO2f,all-week,night,2020,all-year,r1,3.0557,gasCCGT,0,2020 -0,electricity,all-week,morning,2020,all-year,r1,0.0667,gasCCGT,1,2020 -0,CO2f,all-week,morning,2020,all-year,r1,6.1113,gasCCGT,1,2020 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1000,gasCCGT,2,2020 -0,CO2f,all-week,afternoon,2020,all-year,r1,9.1670,gasCCGT,2,2020 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0667,gasCCGT,3,2020 -0,CO2f,all-week,early-peak,2020,all-year,r1,6.1113,gasCCGT,3,2020 -0,electricity,all-week,night,2020,all-year,r1,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,r1,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,r1,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,r1,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.0865,windturbine,3,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.0833,gasCCGT,4,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,7.6392,gasCCGT,4,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.0833,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,r1,7.6392,gasCCGT,5,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.2542,windturbine,5,2025 -1,electricity,all-week,night,2025,all-year,r1,0.4132,windturbine,0,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.1969,windturbine,1,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.4132,windturbine,2,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.1969,windturbine,3,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.4035,windturbine,5,2030 -0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2035 -1,electricity,all-week,night,2030,all-year,r1,0.3771,windturbine,0,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.7771,windturbine,1,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3771,windturbine,2,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.7771,windturbine,3,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.3604,windturbine,5,2035 -0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2040 -1,electricity,all-week,night,2030,all-year,r1,0.5104,windturbine,0,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.1604,windturbine,1,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.5104,windturbine,2,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.1604,windturbine,3,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.6271,windturbine,5,2040 -0,electricity,all-week,night,2025,all-year,r1,0.4229,windturbine,0,2045 -1,electricity,all-week,night,2030,all-year,r1,0.6438,windturbine,0,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.4229,windturbine,1,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.3604,windturbine,1,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.4229,windturbine,2,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.6438,windturbine,2,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.4229,windturbine,3,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.3604,windturbine,3,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.4229,windturbine,4,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.4229,windturbine,5,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.8938,windturbine,5,2045 -1,electricity,all-week,night,2030,all-year,r1,0.8167,windturbine,0,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3833,windturbine,0,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.8167,windturbine,1,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.9833,windturbine,1,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.8167,windturbine,2,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3833,windturbine,2,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.8167,windturbine,3,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.9833,windturbine,3,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.8167,windturbine,4,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.8229,windturbine,4,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.8167,windturbine,5,2050 -2,electricity,all-week,evening,2035,all-year,r1,1.1604,windturbine,5,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.4000,windturbine,5,2050 -4,electricity,all-week,evening,2045,all-year,r1,0.0229,windturbine,5,2050 +asset,commodity,day,hour,installed,month,supply,technology,timeslice,year +0,electricity,all-week,night,2020,all-year,0.0333,gasCCGT,0,2020 +0,CO2f,all-week,night,2020,all-year,3.0557,gasCCGT,0,2020 +0,electricity,all-week,morning,2020,all-year,0.0667,gasCCGT,1,2020 +0,CO2f,all-week,morning,2020,all-year,6.1113,gasCCGT,1,2020 +0,electricity,all-week,afternoon,2020,all-year,0.1000,gasCCGT,2,2020 +0,CO2f,all-week,afternoon,2020,all-year,9.1670,gasCCGT,2,2020 +0,electricity,all-week,early-peak,2020,all-year,0.0667,gasCCGT,3,2020 +0,CO2f,all-week,early-peak,2020,all-year,6.1113,gasCCGT,3,2020 +0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,0.0833,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,7.6392,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2025 +0,electricity,all-week,evening,2020,all-year,0.0833,gasCCGT,5,2025 +0,CO2f,all-week,evening,2020,all-year,7.6392,gasCCGT,5,2025 +1,electricity,all-week,evening,2025,all-year,0.2542,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,0.4132,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,0.4229,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,0.1969,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,0.4132,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,0.4229,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,0.1969,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,0.8167,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,0.4229,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,0.4035,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,0.4229,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,0.3771,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,0.4229,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,0.7771,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,0.4229,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,0.3771,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,0.4229,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,0.7771,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,0.8167,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,0.4229,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,0.8167,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,0.4229,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,0.5104,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,0.4229,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,0.8167,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,0.4229,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,0.5104,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,0.4229,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,0.8167,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,0.8167,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,0.4229,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,0.8167,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,0.4229,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,0.6438,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,0.4229,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,0.8167,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,0.4229,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,0.6438,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,0.4229,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,0.8167,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,0.8167,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,0.4229,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,0.8167,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,0.8167,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,0.3833,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,0.8167,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,0.9833,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,0.8167,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,0.3833,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,0.8167,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,0.9833,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,0.8167,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,0.8229,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,0.8167,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,0.4000,windturbine,5,2050 +4,electricity,all-week,evening,2045,all-year,0.0229,windturbine,5,2050 From 4dda6f555e4f3ad620c7ddbceb3aaf41db2cd5d7 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:20:03 +0100 Subject: [PATCH 24/41] Fix error with dispatch ordering --- src/muse/dispatch.py | 83 ++++++++++++++++++++++++++---------------- tests/test_dispatch.py | 9 +++-- 2 files changed, 57 insertions(+), 35 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index ca657e499..ec35dc367 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -259,6 +259,11 @@ def merit_order_production( region=("asset", [capacity.region.item()] * capacity.sizes["asset"]) ) + # Align arrays + demand, capacity, technologies, prices = xr.align( + demand, capacity, technologies, prices, join="exact" + ) + # Maximum and minimum production for each asset maxprod = maximum_production( technologies, capacity, timeslice_level=timeslice_level @@ -275,11 +280,6 @@ def merit_order_production( timeslice_level=timeslice_level, ) - # Verify all asset-level inputs are positionally aligned before using isel. - xr.align( - technologies, capacity, maxprod, minprod, maxcons, join="exact", copy=False - ) - # Initialise result with zeros result = xr.zeros_like(maxprod) @@ -290,12 +290,18 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - region_assets = maxprod_y.get_index("asset")[ - maxprod_y.region.values == region - ] - maxprod_region = maxprod_y.sel(asset=region_assets) - techs_region = technologies.sel(asset=region_assets) - minprod_region = minprod_y.sel(asset=region_assets) + maxprod_region = maxprod_y.sel( + asset=maxprod_y.asset[maxprod_y.region == region] + ) + techs_region = technologies.sel( + asset=technologies.asset[technologies.region == region] + ) + minprod_region = minprod_y.sel( + asset=minprod_y.asset[minprod_y.region == region] + ) + maxcons_region = maxcons_y.sel( + asset=maxcons_y.asset[maxcons_y.region == region] + ) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. @@ -303,20 +309,25 @@ def merit_order_production( techs_region, prices_y.sel(region=region), production=maxprod_region, - consumption=maxcons_y.sel(asset=region_assets), + consumption=maxcons_region, ) # Calculate production for this year by dispatching assets in order of # increasing cost until demand is met for ts in maxprod_y.timeslice.values: - result.loc[dict(year=y, timeslice=ts, asset=region_assets)] = ( - dispatch_by_merit_order( - demand=demand.sel(year=y, timeslice=ts, region=region), - minprod=minprod_region.sel(timeslice=ts), - maxprod=maxprod_region.sel(timeslice=ts), - technology_costs=technology_costs.sel(timeslice=ts), - ) + dispatch = dispatch_by_merit_order( + demand=demand.sel(year=y, timeslice=ts, region=region), + minprod=minprod_region.sel(timeslice=ts), + maxprod=maxprod_region.sel(timeslice=ts), + technology_costs=technology_costs.sel(timeslice=ts), ) + result.loc[ + dict( + year=y, + timeslice=ts, + asset=result.asset[result.region == region], + ) + ] = dispatch # Add production of environmental pollutants env = is_pollutant(technologies.comm_usage) @@ -340,17 +351,17 @@ def dispatch_by_merit_order( For example, we have the following three assets (ordered from cheapest to most expensive): - - Asset A: minprod=10, maxprod=100, cost=5 - - Asset B: minprod=20, maxprod=50, cost=10 + - Asset A: minprod=20, maxprod=50, cost=10 + - Asset B: minprod=10, maxprod=100, cost=5 - Asset C: minprod=0, maxprod=30, cost=15 If the total demand is 140 units, we would dispatch as follows: - First we dispatch Assets A and B at their minimum production, which gives us 30 units of supply, leaving 110 units of remaining demand. - - Next we dispatch Asset A up to its maximum, which gives us an additional 90 units + - Next we dispatch Asset B up to its maximum, which gives us an additional 90 units of supply, leaving 20 units of remaining demand. - - The remaining demand of 20 is less than the headroom of Asset B above its - minimum (i.e. 50 - 20 = 30), so we dispatch Asset B for an additional 20 units, + - The remaining demand of 20 is less than the headroom of Asset A above its + minimum (i.e. 50 - 20 = 30), so we dispatch Asset A for an additional 20 units, which meets the total demand of 140. - Asset C is not dispatched at all since it's the most expensive and demand is already met by cheaper assets. @@ -372,18 +383,23 @@ def dispatch_by_merit_order( assert set(maxprod.dims) == {"asset", "commodity"} assert set(technology_costs.dims) == {"asset"} - # Start with minimum production - result = minprod.copy() + # Align all inputs by asset labels before dispatch calculations. + minprod, maxprod, technology_costs = xr.align( + minprod, maxprod, technology_costs, join="exact" + ) # Calculate remaining demand after minimum production (i.e. what we need to meet # with the available headroom above minimum) remaining = demand - minprod.sum("asset") - # Rank assets by cost (cheapest first) - order = technology_costs.sortby(technology_costs).asset + # Numerical noise or inconsistent inputs can yield tiny negative headroom; + # clamp to zero so additional dispatch never drives production below minprod. + available_headroom = (maxprod - minprod).clip(min=0) - # Available extra production above minimum, sorted by cost - available = (maxprod - minprod).sel(asset=order) + # Sort assets by increasing cost using explicit positional indexing. + # This works for both labelled and unlabelled asset dimensions. + order = np.argsort(technology_costs.values, kind="stable") + available = available_headroom.isel(asset=order) # cumsum_before[i] = total available production of all assets cheaper than # i @@ -392,7 +408,12 @@ def dispatch_by_merit_order( # (remaining - cumsum_before)[i] = demand still unmet after cheaper assets # are fully utilised. Clipping to [0, available[i]] ensures we never # produce negative amounts or exceed this asset's headroom above minprod. - addition = (remaining - cumsum_before).clip(min=0, max=available) + addition_sorted = (remaining - cumsum_before).clip(min=0, max=available) + + # Map dispatch additions back to the original asset order. + inverse_order = np.empty_like(order) + inverse_order[order] = np.arange(order.size) + addition = addition_sorted.isel(asset=inverse_order) # Final production is minimum production plus any additional production from these # assets diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index be84ac523..c4c9efb55 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -91,6 +91,7 @@ def test_merit_order_supply_single_region( technologies = technologies.where(technologies.region == region, drop=True) capacity = capacity.where(capacity.region == region, drop=True) production = production.where(production.region == region, drop=True) + prices = prices.sel(region=region) # Create random demand demand = production.sum("asset") * np.random.rand(*production.sum("asset").shape) @@ -202,23 +203,23 @@ def test_dispatch_by_merit_order(): [140], dims=("commodity",), coords={"commodity": ["electricity"]} ) minprod = xr.DataArray( - [[10], [20], [0]], + [[20], [10], [0]], dims=("asset", "commodity"), coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, ) maxprod = xr.DataArray( - [[100], [50], [30]], + [[50], [100], [30]], dims=("asset", "commodity"), coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, ) technology_costs = xr.DataArray( - [5, 10, 15], dims=("asset",), coords={"asset": ["A", "B", "C"]} + [10, 5, 15], dims=("asset",), coords={"asset": ["A", "B", "C"]} ) result = dispatch_by_merit_order(demand, minprod, maxprod, technology_costs) expected = xr.DataArray( - [[100], [40], [0]], + [[40], [100], [0]], dims=("asset", "commodity"), coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, ) From 5f161db74159d1b3c226383296244e04b3d2f72e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:26:18 +0100 Subject: [PATCH 25/41] Update results AGAIN --- .../Results/MCACapacity.csv | 144 ++++++---- .../1-single-objective/Results/MCAPrices.csv | 144 +++++----- .../1-single-objective/Results/MCASupply.csv | 114 ++++---- .../Results/MCACapacity.csv | 128 +++++---- .../Results/MCAPrices.csv | 144 +++++----- .../Results/MCASupply.csv | 166 ++++++------ .../1-correlation/Results/MCACapacity.csv | 56 ++-- .../1-correlation/Results/MCAPrices.csv | 144 +++++----- .../1-correlation/Results/MCASupply.csv | 74 +++-- .../1-introduction/Results/MCACapacity.csv | 60 ++-- .../1-introduction/Results/MCAPrices.csv | 144 +++++----- .../1-introduction/Results/MCASupply.csv | 90 +++--- .../2-scenario/Results/MCACapacity.csv | 62 +++-- .../2-scenario/Results/MCAPrices.csv | 144 +++++----- .../2-scenario/Results/MCASupply.csv | 98 +++---- .../1-new-region/Results/MCACapacity.csv | 150 +++++----- .../1-new-region/Results/MCAPrices.csv | 256 +++++++++--------- .../1-new-region/Results/MCASupply.csv | 228 ++++++++-------- .../Results/MCACapacity.csv | 79 +++--- .../Results/MCAPrices.csv | 216 +++++++-------- .../Results/MCASupply.csv | 138 ++++------ .../2-agents/Results/MCACapacity.csv | 70 +++-- .../2-agents/Results/MCAPrices.csv | 144 +++++----- .../2-agents/Results/MCASupply.csv | 114 ++++---- .../Results/MCACapacity.csv | 79 +++--- .../1-exogenous-demand/Results/MCAPrices.csv | 216 +++++++-------- .../1-exogenous-demand/Results/MCASupply.csv | 138 ++++------ .../1-carbon-budget/Results/MCAPrices.csv | 36 +-- .../1-carbon-budget/Results/MCASupply.csv | 24 +- .../1-min-constraint/Results/MCAPrices.csv | 24 +- .../1-min-constraint/Results/MCASupply.csv | 16 +- .../1-min-constraint/Results/Power_Supply.csv | 24 +- .../2-max-constraint/Results/MCAPrices.csv | 24 +- .../2-max-constraint/Results/MCASupply.csv | 20 +- .../2-max-constraint/Results/Power_Supply.csv | 28 +- .../Results/MCACapacity.csv | 59 ++-- .../1-modify-timeslices/Results/MCAPrices.csv | 192 ++++++------- .../1-modify-timeslices/Results/MCASupply.csv | 128 ++++----- .../Results/MCAPrices.csv | 128 ++++----- .../Results/MCASupply.csv | 112 ++++---- docs/user-guide/add-agent.ipynb | 4 +- .../add-gdp-correlation-demand.ipynb | 4 +- docs/user-guide/add-region.ipynb | 4 +- .../additional-service-demand.ipynb | 4 +- docs/user-guide/carbon-budget.ipynb | 4 +- .../min-max-timeslice-constraints.ipynb | 4 +- docs/user-guide/modify-timing-data.ipynb | 4 +- docs/user-guide/subsectors.ipynb | 4 +- .../default/Results/MCACapacity.csv | 59 ++-- .../default/Results/MCAPrices.csv | 144 +++++----- .../default/Results/MCASupply.csv | 98 +++---- .../default_adhoc/Results/MCACapacity.csv | 60 ++-- .../default_adhoc/Results/MCAPrices.csv | 144 +++++----- .../default_adhoc/Results/MCASupply.csv | 90 +++--- .../Results/MCACapacity.csv | 56 ++-- .../default_correlation/Results/MCAPrices.csv | 144 +++++----- .../default_correlation/Results/MCASupply.csv | 74 +++-- .../default_timeslice/Results/MCAPrices.csv | 24 +- .../default_timeslice/Results/MCASupply.csv | 20 +- .../Results/Power_Supply.csv | 20 +- .../medium/Results/MCAPrices.csv | 12 +- .../multiple_agents/Results/MCAPrices.csv | 12 +- 62 files changed, 2729 insertions(+), 2615 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 aa9c45005..e562e24d9 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,98 +6,122 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 -A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 -A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2035 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2040 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 -A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 -A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2040 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 -A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 -A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2040 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2040 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2040 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 +A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2040 +A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2040 +A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 A2,8.5000,r1,2040,r1,residential,gasboiler,newcapa,2045 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2045 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 -A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 -A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2045 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 +A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 -A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 -A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2045 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2045 +A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2045 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2045 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2045 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2045 +A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2045 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 A2,15.5000,r1,2045,r1,residential,gasboiler,newcapa,2050 A2,11.5000,r1,2050,r1,residential,gasboiler,newcapa,2050 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 -A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 -A1,2.3516,r1,2040,r1,power,windturbine,newcapa,2050 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 +A1,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 +A1,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 A1,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,1.5000,r1,2050,r1,power,windturbine,newcapa,2050 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 -A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 -A2,2.3516,r1,2040,r1,power,windturbine,newcapa,2050 +A1,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 +A2,4.3516,r1,2035,r1,power,windturbine,newcapa,2050 +A2,1.5000,r1,2040,r1,power,windturbine,newcapa,2050 A2,1.5000,r1,2045,r1,power,windturbine,newcapa,2050 -A2,1.5000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2050 +A2,1.8867,r1,2050,r1,power,windturbine,newcapa,2050 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 +A1,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A1,1.9333,r1,2050,r1,gas,gassupply1,newcapa,2050 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,0.3969,r1,2040,r1,gas,gassupply1,newcapa,2050 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,2.0080,r1,2035,r1,gas,gassupply1,newcapa,2050 +A2,1.9333,r1,2040,r1,gas,gassupply1,newcapa,2050 A2,1.9333,r1,2045,r1,gas,gassupply1,newcapa,2050 A2,1.9333,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 96acdc5a2..b3747ab2c 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2646,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,17.1169,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4617,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,14.0010,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2646,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,17.1169,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4617,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.2128,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.5944,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,17.8142,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5059,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,16.0432,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.6695,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.6142,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,16.7131,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.6695,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.6972,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,16.0432,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.6695,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.6142,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,16.7131,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.6695,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.6972,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.9437,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.6695,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9737,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.0481,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.6695,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.7387,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.0354,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.5760,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.4937,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.8045,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.1573,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.8476,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.0354,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.5760,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.4937,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.8045,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.1573,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.8476,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,25.9975,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.7385,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,15.4862,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.3695,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.4479,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,14.1606,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.5959,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.8586,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,14.2785,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.0960,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,15.1348,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,14.9785,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.5959,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.8586,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,14.2785,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.0960,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,15.1348,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,14.9785,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,26.4733,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.3085,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.4540,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.6795,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,15.2730,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.6952,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.1781,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,17.3271,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.8219,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.7835,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,17.4899,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,17.5430,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.1781,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,17.3271,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,16.8219,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.7835,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,17.4899,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,17.5430,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.5710,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,20.5320,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,20.5005,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,15.9243,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,17.5713,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,17.9711,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.9536,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,19.8390,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,19.6040,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.7900,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,19.9426,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,19.9712,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.9536,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,19.8390,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,19.6040,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.7900,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,19.9426,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,19.9712,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.4351,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,23.1626,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.3002,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.7355,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,20.5690,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,20.5603,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv index 4dca91a89..5637ccac5 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCASupply.csv @@ -17,72 +17,78 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3568,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,75.6382,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0782,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,115.8206,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3568,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,75.6382,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0782,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,115.8206,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.2425,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,236.3679,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.7997,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.6886,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,156.0030,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.2066,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.3342,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,94.2002,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.5330,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,74.4277,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.3099,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.0013,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,141.3004,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.6886,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,111.6416,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.2066,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.3342,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,94.2002,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.5330,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,74.4277,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.3099,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.0013,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,141.3004,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,5.0659,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,111.6416,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.6198,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.0974,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,282.6007,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.1687,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,3.3773,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,228.4874,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.4132,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.6684,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,188.4005,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.3622,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.2698,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,148.8555,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.4000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,1.1600,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,70.8327,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.5432,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.9046,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,64.7100,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.6000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.7400,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,106.2491,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.3622,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.2698,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,97.0650,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.4000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,1.1600,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,70.8327,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.5432,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.9046,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,64.7100,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.6000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.7400,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,106.2491,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.0865,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.8093,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,97.0650,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,1.2000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,3.5748,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,212.4982,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,0.7243,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.5395,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,199.3342,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,0.8000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,2.3200,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,141.6655,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,129.4200,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.4667,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,r1,1.3533,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 @@ -100,9 +106,9 @@ gas,all-week,early-peak,all-year,r1,2.0300,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,r1,113.2425,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,1.4000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,4.0600,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,4.1548,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,226.4850,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,231.6892,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.9333,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,r1,2.7067,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 @@ -124,9 +130,9 @@ gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,1.6000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,4.7348,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,264.0442,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,1.0667,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 @@ -148,9 +154,9 @@ gas,all-week,early-peak,all-year,r1,2.6100,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,r1,145.5975,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,1.8000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,5.2200,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,5.3148,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,291.1950,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,296.3992,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,1.2000,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,r1,3.4800,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,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 6d31c4722..6bf31227d 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,88 +6,104 @@ A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2025 A2,2.5000,r1,2020,r1,residential,gasboiler,newcapa,2025 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2025 A1,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2025 A2,0.5000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2025 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 A2,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2030 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,5.7031,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,3.7969,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2030 A2,9.5000,r1,2025,r1,residential,gasboiler,newcapa,2030 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2030 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2030 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2030 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2030 A1,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 A2,3.7500,r1,2020,r1,gas,gassupply1,newcapa,2030 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,1.7031,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,3.7969,r1,2030,r1,residential,heatpump,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2030 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,5.5000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2035 A2,5.5000,r1,2030,r1,residential,gasboiler,newcapa,2035 -A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2035 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A2,8.7031,r1,2035,r1,residential,gasboiler,newcapa,2035 +A2,3.7969,r1,2035,r1,residential,heatpump,newcapa,2035 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2035 A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2035 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2035 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2035 A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2035 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2035 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,12.5000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 -A2,12.5000,r1,2035,r1,residential,gasboiler,newcapa,2040 -A2,4.7031,r1,2040,r1,residential,gasboiler,newcapa,2040 -A2,3.7969,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A2,8.7031,r1,2035,r1,residential,gasboiler,newcapa,2040 +A2,3.7969,r1,2035,r1,residential,heatpump,newcapa,2040 +A2,8.5000,r1,2040,r1,residential,heatpump,newcapa,2040 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2040 A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 -A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2040 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2040 +A1,5.7500,r1,2040,r1,power,windturbine,newcapa,2040 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2040 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2040 A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2040 -A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2040 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,5.7500,r1,2040,r1,power,windturbine,newcapa,2040 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2040 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 -A2,4.7031,r1,2040,r1,residential,gasboiler,newcapa,2045 -A2,3.7969,r1,2040,r1,residential,heatpump,newcapa,2045 +A2,8.5000,r1,2040,r1,residential,heatpump,newcapa,2045 A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2045 A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 -A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2045 -A1,9.2500,r1,2045,r1,power,windturbine,newcapa,2045 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2045 +A1,5.7500,r1,2040,r1,power,windturbine,newcapa,2045 +A1,7.3516,r1,2045,r1,power,windturbine,newcapa,2045 +A2,0.7734,r1,2025,r1,power,windturbine,newcapa,2045 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2045 A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2045 -A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2045 -A2,9.2500,r1,2045,r1,power,windturbine,newcapa,2045 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,5.7500,r1,2040,r1,power,windturbine,newcapa,2045 +A2,7.3516,r1,2045,r1,power,windturbine,newcapa,2045 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2045 +A2,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 A2,15.5000,r1,2045,r1,residential,heatpump,newcapa,2050 A2,11.5000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A1,0.3438,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.0347,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,3.7969,r1,2030,r1,power,windturbine,newcapa,2050 A1,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 -A1,4.2500,r1,2040,r1,power,windturbine,newcapa,2050 -A1,9.2500,r1,2045,r1,power,windturbine,newcapa,2050 -A1,5.3516,r1,2050,r1,power,windturbine,newcapa,2050 -A2,1.8984,r1,2030,r1,power,windturbine,newcapa,2050 +A1,5.7500,r1,2040,r1,power,windturbine,newcapa,2050 +A1,7.3516,r1,2045,r1,power,windturbine,newcapa,2050 +A1,3.3867,r1,2050,r1,power,windturbine,newcapa,2050 +A2,3.8750,r1,2030,r1,power,windturbine,newcapa,2050 A2,6.2500,r1,2035,r1,power,windturbine,newcapa,2050 -A2,4.2500,r1,2040,r1,power,windturbine,newcapa,2050 -A2,9.2500,r1,2045,r1,power,windturbine,newcapa,2050 -A2,5.3516,r1,2050,r1,power,windturbine,newcapa,2050 -A1,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 -A2,7.9667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A2,5.1698,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,5.7500,r1,2040,r1,power,windturbine,newcapa,2050 +A2,7.3516,r1,2045,r1,power,windturbine,newcapa,2050 +A2,3.3867,r1,2050,r1,power,windturbine,newcapa,2050 +A1,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.2662,r1,2030,r1,gas,gassupply1,newcapa,2050 +A2,6.6418,r1,2025,r1,gas,gassupply1,newcapa,2050 +A2,3.2662,r1,2030,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 ba6eb7521..f63e99024 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2646,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,17.1169,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4617,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,14.0010,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2646,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,17.1169,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4617,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.2128,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.5944,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,17.8142,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5059,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,16.0432,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.6695,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.6142,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,16.7131,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.6695,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.6972,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,16.0432,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.6695,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.6142,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,16.7131,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.6695,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.6972,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.9437,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.6695,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9737,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.0481,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.6695,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.7387,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.4826,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.5760,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.2035,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,15.3153,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.1573,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.3739,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.4826,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.5760,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.2035,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,15.3153,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.1573,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.3739,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.9512,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.7385,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.4654,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.4678,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,14.4479,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.3796,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,12.5222,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.4476,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,13.3878,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.1904,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,13.2365,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.9834,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,13.5565,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.6774,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,12.5222,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.4476,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,13.3878,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.1904,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,13.2365,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.9834,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,13.5565,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.6774,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,28.9388,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,28.4194,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.2647,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.5724,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.2136,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.8985,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,13.7872,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.6018,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,10.3855,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.7171,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.7331,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.8843,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,12.3808,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.5821,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.4531,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.6303,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,10.3855,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.7171,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.7331,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.8843,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,12.3808,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.5821,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.4531,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.6303,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.5449,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,29.8478,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,15.2852,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,14.5365,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,18.2249,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,15.4545,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.5617,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.7792,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,10.3437,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.3526,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,6.7516,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.7385,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,12.9833,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.5159,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.5497,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.6038,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,10.3437,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.3526,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,6.7516,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.7385,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,12.9833,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.5159,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.5497,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.6038,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,28.2048,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.9892,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.0154,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.1931,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.8730,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.4026,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.8874,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.5585,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv index 9700cd411..dcee5a10d 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCASupply.csv @@ -17,120 +17,116 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3568,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,75.6382,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0782,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,115.8206,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3568,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,75.6382,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0782,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,115.8206,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.2425,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,236.3679,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.7997,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.6886,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,156.0030,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.2066,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.3342,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,94.2002,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.1266,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.5330,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,74.4277,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.3099,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,2.0013,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,141.3004,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.6886,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,111.6416,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.2066,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,1.3342,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,94.2002,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.1266,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.5330,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,74.4277,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.3099,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,2.0013,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,141.3004,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,5.0659,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,111.6416,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.6198,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,4.0974,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,282.6007,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.1687,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,3.3773,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,228.4874,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.4132,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.6684,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,188.4005,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.3622,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.2698,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,148.8555,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.4844,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,0.9153,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,70.8327,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.5432,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.9046,1,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,r1,51.0602,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,r1,0.7266,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,1.3730,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,106.2491,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.3622,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.2698,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r1,76.5904,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.4844,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,0.9153,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,70.8327,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.5432,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.9046,3,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,r1,51.0602,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,r1,0.7266,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,1.3730,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,106.2491,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.0865,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,3.8093,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r1,76.5904,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,1.4531,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,2.8407,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,212.4982,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,0.7243,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,2.5395,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,158.3849,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,0.9688,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,1.8306,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,141.6655,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,r1,0.5510,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,1.1086,0,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,r1,102.1205,5,MUS$2010/kt,2035 +electricity,all-week,night,all-year,r1,0.7399,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,r1,0.5609,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,61.8452,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,r1,0.8266,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,1.6630,1,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,r1,31.2877,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,r1,1.1099,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r1,0.8413,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,92.7679,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,r1,0.5510,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,1.1086,2,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,r1,46.9316,1,MUS$2010/kt,2040 +electricity,all-week,afternoon,all-year,r1,0.7399,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,r1,0.5609,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,61.8452,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,r1,0.8266,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,1.6630,3,MUS$2010/PJ,2040 +CO2f,all-week,afternoon,all-year,r1,31.2877,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,r1,1.1099,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r1,0.8413,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,92.7679,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,r1,1.6531,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,3.3259,4,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,r1,46.9316,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,r1,2.2198,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.7774,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,185.5357,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,r1,1.1021,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,2.2173,5,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,99.0674,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,r1,1.4799,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,1.1217,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,123.6905,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,r1,0.9622,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.3031,0,MUS$2010/PJ,2045 +CO2f,all-week,evening,all-year,r1,62.5755,5,MUS$2010/kt,2040 +electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,16.9077,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,r1,1.4432,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.4546,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,25.3616,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,r1,0.9622,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.3031,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,16.9077,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,r1,1.4432,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.4546,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,25.3616,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,r1,2.8865,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.9093,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.0948,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,50.7232,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,r1,1.9243,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.6062,5,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,5.2042,4,MUS$2010/kt,2045 +electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,33.8155,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 @@ -140,6 +136,8 @@ heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.0948,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,5.2042,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,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 b45afdea8..d89a7846c 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,43 +3,55 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2035 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2035 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2035 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2040 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2040 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2040 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2045 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2045 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2045 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2045 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2050 A1,6.4684,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2050 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2050 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2050 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2050 A1,0.3159,r1,2050,r1,power,windturbine,newcapa,2050 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,1.6179,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 92e23b63d..c07d14c17 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 @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2723,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.1939,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2378,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.7610,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.3997,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2723,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.8703,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.1939,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2378,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.7610,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.3997,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.2037,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.6394,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.3314,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2206,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,21.5177,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.2975,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,18.0082,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.2357,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.8003,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.1346,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.0082,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.2357,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.8003,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.1346,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,18.0082,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.2357,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.8003,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.1346,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.0082,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.2357,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.8003,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.1346,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,18.0082,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.7292,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.8003,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.7043,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,18.0082,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.0470,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.8003,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.9851,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,10.9783,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.7634,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.8019,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.9040,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.8542,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.8013,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.8019,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.7191,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,10.9783,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.7634,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.8019,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,6.9040,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.8542,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.8013,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.8019,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.7191,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,22.6485,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.5032,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.8019,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.9999,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.7716,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.5546,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.8019,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.8205,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.3487,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.6810,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.9900,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.8710,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.6966,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.7561,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.3403,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.7011,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.3487,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.6810,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.9900,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.8710,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.6966,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.7561,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.3403,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.7011,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.8408,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.6407,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.6580,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.8549,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,19.3519,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.1785,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.5073,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.6700,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.5488,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.6286,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.1381,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.8501,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,16.5870,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.7700,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.2773,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.7066,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.5488,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.6286,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.1381,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.8501,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,16.5870,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.7700,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.2773,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.7066,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,22.9936,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.8469,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.7350,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.7374,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,19.0885,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,15.3673,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,10.3394,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.7455,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.7219,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.5769,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.2182,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.8294,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,16.4728,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.7714,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.2334,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.7072,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.7219,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.5769,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.2182,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.8294,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,16.4728,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.7714,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.2334,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.7072,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,23.1647,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.1897,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,11.7961,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.6745,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,18.8316,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.2551,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.2340,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.7007,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv index ea15193b0..81f3bcb3b 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCASupply.csv @@ -17,48 +17,54 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.0817,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1680,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,0.8751,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9325,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,60.3400,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,1.6301,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,48.5650,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.3188,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.4053,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,90.9349,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.0817,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,73.1896,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1680,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,0.8751,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,0.9325,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,60.3400,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,1.6301,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,48.5650,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.3188,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.4053,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,90.9349,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,3.2602,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,73.1896,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,2.6375,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8105,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,181.8698,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,2.1786,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,146.3791,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3383,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,1.7625,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8781,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,121.5298,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1252,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7609,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,97.8141,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.2932,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.2739,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,0.9690,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,42.4490,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.1887,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.1468,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,15.2770,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.4418,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,0.4127,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.4603,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,63.9724,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1252,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.7609,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,23.0231,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.2932,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.2739,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,0.9690,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,42.4490,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.1887,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.1468,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,15.2770,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.4418,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,0.4127,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.4603,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,63.9724,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.3774,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.2936,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,23.0231,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.8836,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,1.4556,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,2.9206,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,127.9448,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.2522,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.5326,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,80.6403,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.5905,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,0.6922,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,1.9516,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,85.4958,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,38.4888,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.3985,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,0.9963,0,MUS$2010/PJ,2035 electricity,all-week,morning,all-year,r1,0.6006,1,MUS$2010/PJ,2035 @@ -68,7 +74,9 @@ heat,all-week,afternoon,all-year,r1,0.9963,2,MUS$2010/PJ,2035 electricity,all-week,early-peak,all-year,r1,0.6006,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,1.5015,3,MUS$2010/PJ,2035 electricity,all-week,late-peak,all-year,r1,1.2012,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,3.0029,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r1,0.8027,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.0066,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,0.4094,0,MUS$2010/PJ,2040 @@ -80,7 +88,9 @@ heat,all-week,afternoon,all-year,r1,1.0235,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,0.6170,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,1.5425,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,1.2340,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,3.0849,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.8246,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,2.0614,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,0.4164,0,MUS$2010/PJ,2045 @@ -92,7 +102,9 @@ heat,all-week,afternoon,all-year,r1,1.0410,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,0.6276,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,1.5689,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,1.2551,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,3.1378,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,0.8387,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,2.0967,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,0.4234,0,MUS$2010/PJ,2050 @@ -104,6 +116,8 @@ heat,all-week,afternoon,all-year,r1,1.0585,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,0.6381,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,1.5952,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,1.2762,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,3.1904,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,0.8528,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,2.1319,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index bb6d8fe58..2218a1769 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -3,45 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2030 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2030 +A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2035 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2035 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2035 +A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2035 +A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2035 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2040 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2040 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2040 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2040 +A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2040 +A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2040 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2040 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2045 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2045 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2045 +A1,5.3437,r1,2025,r1,power,solarPV,newcapa,2045 +A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2045 +A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2045 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2045 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2045 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,7.5938,r1,2030,r1,power,solarPV,newcapa,2050 -A1,25.0000,r1,2035,r1,power,solarPV,newcapa,2050 -A1,9.4062,r1,2040,r1,power,solarPV,newcapa,2050 +A1,13.2500,r1,2030,r1,power,solarPV,newcapa,2050 +A1,17.4063,r1,2035,r1,power,solarPV,newcapa,2050 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2050 -A1,6.0000,r1,2050,r1,power,solarPV,newcapa,2050 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.3438,r1,2050,r1,power,solarPV,newcapa,2050 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 77e8b6552..b93425aaa 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,26.7448,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,11.4870,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.3700,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,25.3056,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,11.4870,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.3700,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,26.7448,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,11.4870,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.3700,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,25.3056,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,11.4870,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.3700,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,23.8663,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,17.4776,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.4762,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,24.5860,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,11.4870,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.3700,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,14.8727,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.1499,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.7918,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.5368,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,14.8727,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.0856,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.7918,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.5125,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,14.8727,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.1499,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.7918,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.5368,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,14.8727,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,14.0856,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.7918,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.5125,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,14.8727,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.0212,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.7918,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.4882,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.8727,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.0534,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.7918,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0003,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,11.6899,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,9.2742,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.2860,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.6574,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,14.3422,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,9.5450,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.2466,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.2316,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,11.6899,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,9.2742,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.2860,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,6.6574,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,14.3422,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,9.5450,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.2466,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.2316,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,16.9946,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.2284,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,10.2071,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.8059,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,15.6684,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.9292,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.7268,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.0188,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,11.1514,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,8.9302,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.2734,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.3071,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,12.2928,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.1236,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.3343,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,6.4154,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,11.1514,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,8.9302,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,7.2734,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.3071,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,12.2928,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.1236,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.3343,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,6.4154,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,21.2728,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.3891,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,9.3952,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.8888,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,12.8636,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.1642,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.8648,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.9691,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,10.4969,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,8.6468,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.0580,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.1695,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,11.1696,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.3897,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,7.5146,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.0469,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,10.4969,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,8.6468,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.0580,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.1695,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,11.1696,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.3897,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,7.5146,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.0469,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,23.7374,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,23.2715,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.1065,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.5531,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,11.5060,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.7250,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.7428,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.6631,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,10.0219,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,9.2532,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,6.7962,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.0561,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,10.4499,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,10.1742,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.0653,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.1533,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,10.0219,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,9.2532,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,6.7962,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.0561,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,10.4499,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,10.1742,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.0653,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.1533,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,23.7526,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,24.7370,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.0924,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.9060,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,13.0378,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,12.7434,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.1998,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.0874,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv index 101c2f4e0..432408f87 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCASupply.csv @@ -17,72 +17,66 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,58.9805,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,88.4707,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,58.9805,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,88.4707,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,117.9609,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,61.5082,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,61.5082,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,123.0164,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,82.0109,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 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 b4886a555..6c2d65af0 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,48 +3,56 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2040 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2045 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2045 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,7.5938,r1,2040,r1,power,solarPV,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,6.0000,r1,2040,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2045,r1,power,solarPV,newcapa,2050 A1,6.0000,r1,2050,r1,power,solarPV,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,1.8125,r1,2040,r1,power,windturbine,newcapa,2050 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 13fd2146b..687b9a691 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6526,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.6614,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.3053,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.3190,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.6526,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.6614,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.3053,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.3190,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.2482,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.5361,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.2622,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0521,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,12.3730,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5466,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.7363,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.0919,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.3730,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5466,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.7363,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.0919,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.4125,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5624,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.4179,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.3646,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,9.3092,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,9.6040,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.4390,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,15.2006,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.7412,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.0939,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,9.3092,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,9.6040,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.4390,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,15.2006,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.7412,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.0939,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,24.0507,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,24.0820,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.2302,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.9857,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.8098,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.9213,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,8.9673,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,9.1652,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,6.3211,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.2635,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,13.0190,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.8520,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.6777,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.7382,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,8.9673,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,9.1652,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,6.3211,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.2635,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,13.0190,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.8520,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.6777,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.7382,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,25.5075,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.9280,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.2177,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.9686,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,18.8139,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.3987,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,10.1917,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.1569,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,8.4591,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,8.2626,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,6.1843,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.9025,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,10.3405,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.5032,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.8050,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.1987,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,8.4591,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,8.2626,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,6.1843,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.9025,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,10.3405,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.5032,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.8050,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.1987,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,27.7747,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,28.1977,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.8004,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.8765,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,18.6938,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.1528,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.1230,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.4585,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv index 101c2f4e0..80a7737d3 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCASupply.csv @@ -17,72 +17,68 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.2922,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,71.9166,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.2922,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,71.9166,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.0048,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,111.3581,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 @@ -92,7 +88,9 @@ heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 @@ -104,7 +102,9 @@ heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 @@ -116,6 +116,8 @@ heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,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 5d3848f11..6818377eb 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 @@ -6,95 +6,121 @@ A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,5.0000,r2,2020,r2,residential,gasboiler,newcapa,2025 -A1,19.0000,r2,2025,r2,residential,gasboiler,newcapa,2025 +A1,11.4063,r2,2025,r2,residential,gasboiler,newcapa,2025 +A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,1.0000,r2,2020,r2,power,gasCCGT,newcapa,2025 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 A1,15.0000,r2,2020,r2,gas,gassupply1,newcapa,2025 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,19.0000,r2,2025,r2,residential,gasboiler,newcapa,2030 -A1,3.4062,r2,2030,r2,residential,gasboiler,newcapa,2030 -A1,7.5938,r2,2030,r2,residential,heatpump,newcapa,2030 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,11.4063,r2,2025,r2,residential,gasboiler,newcapa,2030 +A1,7.5938,r2,2025,r2,residential,heatpump,newcapa,2030 +A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2030 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2030 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2030 A1,7.5000,r2,2020,r2,gas,gassupply1,newcapa,2030 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2030 -A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2030 +A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,3.4062,r2,2030,r2,residential,gasboiler,newcapa,2035 -A1,12.5938,r2,2035,r2,residential,gasboiler,newcapa,2035 -A1,7.5938,r2,2030,r2,residential,heatpump,newcapa,2035 -A1,12.4062,r2,2035,r2,residential,heatpump,newcapa,2035 +A1,16.0000,r2,2035,r2,residential,gasboiler,newcapa,2035 +A1,11.0000,r2,2030,r2,residential,heatpump,newcapa,2035 +A1,9.0000,r2,2035,r2,residential,heatpump,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2035 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2035 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2035 -A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2035 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2035 -A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2035 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2035 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2035 +A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2035 +A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,12.5938,r2,2035,r2,residential,gasboiler,newcapa,2040 -A1,9.4062,r2,2040,r2,residential,gasboiler,newcapa,2040 -A1,12.4062,r2,2035,r2,residential,heatpump,newcapa,2040 -A1,7.5938,r2,2040,r2,residential,heatpump,newcapa,2040 +A1,16.0000,r2,2035,r2,residential,gasboiler,newcapa,2040 +A1,6.0000,r2,2040,r2,residential,gasboiler,newcapa,2040 +A1,9.0000,r2,2035,r2,residential,heatpump,newcapa,2040 +A1,11.0000,r2,2040,r2,residential,heatpump,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2040 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2040 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2040 -A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2040 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2040 -A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2040 -A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2040 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2040 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2040 +A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2040 +A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2040 +A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,9.4062,r2,2040,r2,residential,gasboiler,newcapa,2045 -A1,18.5938,r2,2045,r2,residential,gasboiler,newcapa,2045 -A1,7.5938,r2,2040,r2,residential,heatpump,newcapa,2045 -A1,12.4062,r2,2045,r2,residential,heatpump,newcapa,2045 +A1,6.0000,r2,2040,r2,residential,gasboiler,newcapa,2045 +A1,22.0000,r2,2045,r2,residential,gasboiler,newcapa,2045 +A1,11.0000,r2,2040,r2,residential,heatpump,newcapa,2045 +A1,9.0000,r2,2045,r2,residential,heatpump,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2045 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2045 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2045 -A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2045 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2045 -A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2045 -A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2045 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2045 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2045 +A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2045 +A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2045 +A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2045 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,18.5938,r2,2045,r2,residential,gasboiler,newcapa,2050 -A1,15.4062,r2,2050,r2,residential,gasboiler,newcapa,2050 -A1,12.4062,r2,2045,r2,residential,heatpump,newcapa,2050 -A1,7.5938,r2,2050,r2,residential,heatpump,newcapa,2050 +A1,22.0000,r2,2045,r2,residential,gasboiler,newcapa,2050 +A1,12.0000,r2,2050,r2,residential,gasboiler,newcapa,2050 +A1,9.0000,r2,2045,r2,residential,heatpump,newcapa,2050 +A1,11.0000,r2,2050,r2,residential,heatpump,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 +A1,2.3750,r2,2025,r2,power,gasCCGT,newcapa,2050 +A1,2.5139,r2,2030,r2,power,gasCCGT,newcapa,2050 A1,7.5938,r2,2030,r2,power,windturbine,newcapa,2050 -A1,12.4062,r2,2035,r2,power,windturbine,newcapa,2050 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,15.9333,r2,2025,r2,gas,gassupply1,newcapa,2050 -A1,5.4458,r2,2030,r2,gas,gassupply1,newcapa,2050 -A1,6.9764,r2,2040,r2,gas,gassupply1,newcapa,2050 +A1,1.4062,r2,2035,r2,power,windturbine,newcapa,2050 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.7821,r2,2025,r2,gas,gassupply1,newcapa,2050 +A1,3.5837,r2,2030,r2,gas,gassupply1,newcapa,2050 +A1,13.4208,r2,2035,r2,gas,gassupply1,newcapa,2050 +A1,7.7333,r2,2040,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2045,r2,gas,gassupply1,newcapa,2050 A1,7.7333,r2,2050,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 ea2bc3af1..99baf8955 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 @@ -59,129 +59,129 @@ gas,all-week,evening,all-year,7.1528,r2,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,night,all-year,27.2688,r2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2610,r2,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4372,r2,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2610,r2,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4372,r2,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6133,r2,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5253,r2,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6526,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.6614,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,17.9998,r2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6526,r2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.6614,r2,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.3053,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.3190,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.3053,r2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.3190,r2,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.6526,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.6614,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.6526,r2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.6614,r2,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.3053,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.3190,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.3053,r2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.3190,r2,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.2482,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.5361,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.2482,r2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.5361,r2,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.2622,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0521,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.2622,r2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0521,r2,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,12.3730,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5466,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2035 @@ -189,19 +189,19 @@ gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,11.7488,r2,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.7363,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.0919,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.1731,r2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.9251,r2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.3597,r2,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.3730,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5466,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2035 @@ -209,39 +209,39 @@ gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,11.7488,r2,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.7363,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.0919,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.1731,r2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.9251,r2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.3597,r2,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.4125,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5624,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.8481,r2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,14.7812,r2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,14.9541,r2,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.4179,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.3646,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.7497,r2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.8531,r2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.3767,r2,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.8440,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.3350,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2040 @@ -249,19 +249,19 @@ gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,14.6002,r2,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.5727,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.6265,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.7037,r2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,15.6085,r2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.2249,r2,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.8440,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.3350,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2040 @@ -269,39 +269,39 @@ gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,14.6002,r2,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.5727,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.6265,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.7037,r2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,15.6085,r2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.2249,r2,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.3063,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.7200,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,27.7663,r2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,17.1994,r2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,17.9035,r2,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.7195,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8852,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,19.4741,r2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,16.4039,r2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,16.3240,r2,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.2443,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.0951,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2045 @@ -309,19 +309,19 @@ gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,18.5551,r2,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.6190,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.2450,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.4480,r2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,19.4373,r2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,19.2258,r2,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.2443,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.0951,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2045 @@ -329,39 +329,39 @@ gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,18.5551,r2,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.6190,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.2450,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.4480,r2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,19.4373,r2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,19.2258,r2,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.4247,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.9673,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,31.8598,r2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,20.8294,r2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.1277,r2,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.3328,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.1306,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.8930,r2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,20.1334,r2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,20.4666,r2,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.8948,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.4491,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.9553,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 electricity,all-week,night,all-year,10.4241,r2,0,MUS$2010/PJ,2050 @@ -369,19 +369,19 @@ gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,22.7987,r2,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.9238,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.6562,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.3669,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,15.7174,r2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,15.1922,r2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,23.5829,r2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.5051,r2,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.8948,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.4491,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.9553,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,10.4241,r2,2,MUS$2010/PJ,2050 @@ -389,33 +389,33 @@ gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,22.7987,r2,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.9238,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.6562,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.3669,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,15.7174,r2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,15.1922,r2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,23.5829,r2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.5051,r2,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.2733,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.0961,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.7068,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,24.0700,r2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.9534,r2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,24.8203,r2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,26.5808,r2,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.9882,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.9090,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.9927,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,19.8937,r2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,24.3119,r2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,24.2016,r2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,24.8561,r2,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv index f561a8086..3d5ad1a89 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCASupply.csv @@ -35,138 +35,140 @@ CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 gas,all-week,evening,all-year,r2,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r2,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r2,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,night,all-year,r2,1.5467,0,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r2,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r2,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r2,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r2,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r2,74.4498,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r2,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r2,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r2,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r2,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r2,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r2,111.6747,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r2,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r2,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r2,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r2,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r2,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r2,74.4498,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r2,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r2,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r2,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r2,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r2,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r2,111.6747,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r2,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r2,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r2,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r2,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r2,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r2,223.3493,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r2,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r2,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r2,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r2,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r2,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r2,148.8996,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r2,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r2,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r2,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r2,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r2,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r2,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r2,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.2922,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r2,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r2,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,71.9166,1,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r2,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r2,1.2922,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r2,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r2,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r2,71.9166,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r2,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r2,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r2,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r2,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r2,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r2,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r2,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.2922,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r2,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r2,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,71.9166,3,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r2,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r2,1.2922,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r2,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r2,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r2,71.9166,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r2,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r2,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r2,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r2,3.4299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r2,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r2,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r2,190.2411,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.0048,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r2,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r2,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,111.3581,5,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r2,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r2,2.0048,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r2,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r2,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r2,111.3581,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,r2,1.0311,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r2,2.0000,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,r2,57.5200,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r2,1.5467,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r2,1.6580,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r2,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r2,86.2800,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,r2,92.3913,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,r2,1.0311,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r2,2.0000,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,r2,57.5200,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r2,1.5467,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r2,1.6580,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r2,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r2,86.2800,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,r2,92.3913,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r2,3.0933,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r2,4.3180,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r2,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r2,172.5600,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r2,239.7847,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r2,2.0622,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r2,2.5447,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r2,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r2,115.0400,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r2,141.5224,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2040 @@ -176,9 +178,9 @@ CO2f,all-week,night,all-year,r2,79.0900,0,MUS$2010/kt,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r2,2.1267,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,r2,2.2380,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r2,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r2,118.6350,1,MUS$2010/kt,2040 +CO2f,all-week,morning,all-year,r2,124.7463,1,MUS$2010/kt,2040 electricity,all-week,afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2040 @@ -188,21 +190,23 @@ CO2f,all-week,afternoon,all-year,r2,79.0900,2,MUS$2010/kt,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r2,2.1267,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,r2,2.2380,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r2,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r2,118.6350,3,MUS$2010/kt,2040 +CO2f,all-week,early-peak,all-year,r2,124.7463,3,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r2,4.2533,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r2,5.4780,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r2,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r2,237.2700,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r2,304.4947,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r2,2.8356,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r2,3.3180,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r2,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r2,158.1800,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r2,184.6624,5,MUS$2010/kt,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2045 @@ -212,9 +216,9 @@ CO2f,all-week,night,all-year,r2,100.6600,0,MUS$2010/kt,2045 electricity,all-week,morning,all-year,r1,1.6000,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r2,2.7067,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,r2,2.8180,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r2,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r2,150.9900,1,MUS$2010/kt,2045 +CO2f,all-week,morning,all-year,r2,157.1013,1,MUS$2010/kt,2045 electricity,all-week,afternoon,all-year,r1,1.0667,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2045 @@ -224,21 +228,23 @@ CO2f,all-week,afternoon,all-year,r2,100.6600,2,MUS$2010/kt,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r2,2.7067,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,r2,2.8180,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r2,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r2,150.9900,3,MUS$2010/kt,2045 +CO2f,all-week,early-peak,all-year,r2,157.1013,3,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r2,5.4133,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r2,6.6380,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r2,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r2,301.9800,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r2,369.2047,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r2,3.6089,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,r2,4.0913,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r2,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r2,201.3200,5,MUS$2010/kt,2045 +CO2f,all-week,evening,all-year,r2,227.8024,5,MUS$2010/kt,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,night,all-year,r2,0.4444,0,MUS$2010/PJ,2050 @@ -248,9 +254,9 @@ CO2f,all-week,night,all-year,r2,122.2300,0,MUS$2010/kt,2050 electricity,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r2,0.6667,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r2,3.2867,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,r2,3.3980,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r2,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r2,183.3450,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,r2,189.4563,1,MUS$2010/kt,2050 electricity,all-week,afternoon,all-year,r1,1.2000,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r2,0.4444,2,MUS$2010/PJ,2050 @@ -260,18 +266,20 @@ CO2f,all-week,afternoon,all-year,r2,122.2300,2,MUS$2010/kt,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r2,0.6667,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r2,3.2867,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,r2,3.3980,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r2,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r2,183.3450,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,r2,189.4563,3,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 electricity,all-week,late-peak,all-year,r2,1.3333,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r2,6.5733,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r2,7.7980,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r2,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r2,366.6900,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r2,433.9147,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r2,0.8889,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r2,4.3822,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,r2,4.8647,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r2,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r2,244.4600,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,r2,270.9424,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv index 17cb547ad..3a0509853 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCACapacity.csv @@ -4,65 +4,70 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2030 -A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2030 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2030 +A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2030 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2035 +A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2035 -A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2035 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2035 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2040 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2040 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2040 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2045 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2045 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2045 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,electric_stove,newcapa,2050 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,0.1806,r1,2050,r1,power,gasCCGT,newcapa,2050 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2050 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2050 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,11.5938,r1,2050,r1,power,windturbine,newcapa,2050 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,12.0000,r1,2050,r1,power,windturbine,newcapa,2050 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv index e1a14c71f..621b8442b 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.6620,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4047,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.6620,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.4046,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.6620,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4047,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.4462,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6305,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,10.4231,r1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.6620,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.4047,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,21.7330,r1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,10.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,14.7846,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.4864,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.6858,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,11.7615,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,21.7330,r1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,9.8077,r1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.3067,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.4864,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.3110,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,11.7615,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,21.7330,r1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.4330,r1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.7846,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.4864,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.6858,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,11.7615,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,21.7330,r1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,9.8077,r1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.3067,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.4864,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.3110,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,11.7615,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,33.3662,r1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.4330,r1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,24.0350,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.6642,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9791,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,12.9394,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,27.5496,r1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,12.1010,r1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.1816,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.0753,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.0238,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,12.3504,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.9827,r1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,11.1457,r1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.1300,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.2893,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.4494,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,10.9902,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,21.2477,r1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,7.4494,r1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.4587,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.7474,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.5809,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.4483,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.9827,r1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,7.5809,r1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.1300,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.2893,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.4494,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,10.9902,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,21.2477,r1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,7.4494,r1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.4587,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.7474,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.5809,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.4483,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,22.5128,r1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,7.5809,r1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.1085,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,12.2056,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.8408,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,11.9065,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,21.8803,r1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,11.8408,r1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.2239,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.9765,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.6870,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,11.6774,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,19.4632,r1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,8.6870,r1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.2044,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.0792,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,18.8556,r1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,7.0792,r1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.3538,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.1389,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,19.4632,r1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,7.1389,r1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.2044,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.0792,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,18.8556,r1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,7.0792,r1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.3538,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.1389,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,27.7346,r1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,7.1389,r1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.8423,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.9343,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.5518,r1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,12.9343,r1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.2777,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.1085,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,19.6913,r1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,9.1085,r1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.8439,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.9350,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,18.1764,r1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,6.9350,r1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.0217,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.4061,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,19.6913,r1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,7.4061,r1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.8439,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.9350,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,18.1764,r1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,6.9350,r1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.0217,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.4061,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,31.0576,r1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,7.4061,r1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.9269,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.7682,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.4189,r1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,13.7682,r1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.0625,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.0224,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,20.3427,r1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.0224,r1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.5155,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.8036,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,18.1568,r1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,6.8036,r1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.5501,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.2175,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,20.3427,r1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,7.2175,r1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.5155,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.8036,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,18.1568,r1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,6.8036,r1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.5501,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.2175,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,31.4621,r1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,7.2175,r1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.3147,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.7233,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.8197,r1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,14.7233,r1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.9280,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.3686,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.3686,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv index a14c3c1af..adbf7b8c2 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCASupply.csv @@ -23,177 +23,147 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,2.6782,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,135.4920,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.0173,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,203.2380,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,2.6782,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,135.4920,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.0173,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,203.2380,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,8.0346,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,406.4760,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,5.3564,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,270.9840,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,3.4515,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.8264,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,2.0048,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,173.7287,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,102.0366,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,5.1773,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,1.2396,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,3.4299,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,260.5930,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,176.2589,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,3.4515,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.8264,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,2.0048,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,173.7287,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,102.0366,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,5.1773,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,1.2396,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,3.4299,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,260.5930,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,176.2589,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,9.5092,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,2.4792,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,7.7052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,474.7781,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,398.9258,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,6.6213,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,1.6528,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,4.8550,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,331.9880,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,250.4812,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,1.4486,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.2845,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,1.6000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,68.1152,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,2.1729,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.5040,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,2.4000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,78.9688,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,1.4486,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.2845,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,1.6000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,68.1152,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,2.1729,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.5040,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,2.4000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,78.9688,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,4.3458,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,2.1625,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,4.8000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,111.5298,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,2.8972,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,1.7235,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,3.2000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.6228,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,89.8225,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,34.1853,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,1.8667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2040 cook,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,2.8000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,2.8000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,0.1774,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,9.7399,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,2.1333,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2045 cook,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r1,3.2000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r1,2.1333,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,3.2000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,6.4000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,4.2667,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,2.4000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.8907,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,48.8907,0,MUS$2010/kt,2050 cook,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,3.6000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.8907,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,48.8907,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r1,2.4000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.8907,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,48.8907,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,3.6000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.8907,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,48.8907,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,7.2000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.8907,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,48.8907,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,4.8000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.8907,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,48.8907,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv index 4301e82bc..ae5304fbb 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCACapacity.csv @@ -4,60 +4,78 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 A1,11.0000,r1,2030,r1,residential,gas_stove,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 A1,11.0000,r1,2030,r1,residential,gas_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,gas_stove,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 A1,25.0000,r1,2035,r1,residential,gas_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,gas_stove,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2040 +A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 A1,17.0000,r1,2040,r1,residential,gas_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,gas_stove,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2045 -A1,1.8208,r1,2045,r1,gas,gassupply1,newcapa,2045 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2045 +A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2045 +A1,7.7333,r1,2045,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 A1,31.0000,r1,2045,r1,residential,gas_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,gas_stove,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,13.1792,r1,2030,r1,gas,gassupply1,newcapa,2050 -A1,1.8208,r1,2045,r1,gas,gassupply1,newcapa,2050 +A1,42.7154,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,11.3171,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,0.5319,r1,2035,r1,gas,gassupply1,newcapa,2050 +A1,7.7333,r1,2040,r1,gas,gassupply1,newcapa,2050 +A1,7.7333,r1,2045,r1,gas,gassupply1,newcapa,2050 A1,7.7333,r1,2050,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv index 46f1fe069..ad556edbd 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.5298,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4341,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.5298,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4341,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.4820,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.4581,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6526,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.6614,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 cook,all-week,night,all-year,11.9211,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.3053,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.3190,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,11.9211,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.6526,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.6614,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,11.9211,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.3053,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.3190,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,11.9211,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.2482,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.5361,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,11.9211,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.2622,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0521,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,11.9211,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,12.3730,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.1761,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5466,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 cook,all-week,night,all-year,14.8150,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.7363,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.0919,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,14.8150,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.3730,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.1761,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5466,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,14.8150,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.7363,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.0919,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,14.8150,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.4125,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5624,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,14.8151,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.4179,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.3646,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,14.8150,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.8440,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.3350,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 cook,all-week,night,all-year,17.7090,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.5727,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.6265,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,17.7090,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.8440,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.3350,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,17.7090,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.5727,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.6265,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,17.7090,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.3063,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.7199,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,17.7090,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.7195,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8852,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,17.7090,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.2443,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.0951,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 cook,all-week,night,all-year,21.7686,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.6190,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.2450,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,21.7686,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.2443,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.0951,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,21.7686,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.6190,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.2450,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,21.7686,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.4247,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.9673,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,21.7686,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.3328,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.1305,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,21.7686,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.8948,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.4490,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.9553,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 cook,all-week,night,all-year,25.8281,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.9238,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.6562,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.3669,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,25.8281,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.8948,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.4490,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.9553,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,25.8281,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.9238,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.6562,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.3669,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,25.8281,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.2733,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.0961,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.7068,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,25.8281,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.9882,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.9090,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.9927,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,25.8281,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv index 9e4096996..31eeca192 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCASupply.csv @@ -23,89 +23,95 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,2.8858,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,141.1164,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.3287,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,211.6747,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,2.8858,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,141.1164,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.3287,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,211.6747,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,8.6573,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,423.3493,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,5.7715,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,282.2329,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,3.3773,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,2.6684,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,163.8838,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,124.3388,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,5.0659,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,4.1922,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,245.8257,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,196.9166,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,3.3773,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,2.6684,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,163.8838,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,124.3388,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,5.0659,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,4.1922,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,245.8257,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,196.9166,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,10.1319,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,9.2299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,491.6514,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,440.2411,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,6.7546,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,5.8714,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,327.7676,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,278.0247,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,2.5395,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,r1,2.3200,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,112.2455,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,r1,100.0000,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,3.8093,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,r1,3.4800,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,168.3682,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,r1,150.0000,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,2.5395,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,r1,2.3200,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,112.2455,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,r1,100.0000,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,3.8093,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,r1,3.4800,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,168.3682,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,r1,150.0000,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,7.6185,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,8.1847,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,336.7364,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,367.2247,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,5.0790,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,4.6400,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,224.4909,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,200.0000,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,r1,2.7067,0,MUS$2010/PJ,2040 @@ -128,9 +134,9 @@ heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,r1,175.0000,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,8.1200,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,9.3447,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,350.0000,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,417.2247,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,r1,5.4133,5,MUS$2010/PJ,2040 @@ -158,9 +164,9 @@ heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,r1,200.0000,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,10.5047,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,400.0000,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,467.2247,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2045 @@ -188,9 +194,9 @@ heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,r1,225.0000,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,10.4400,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,11.6647,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,450.0000,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,517.2247,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,r1,6.9600,5,MUS$2010/PJ,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 a0440b601..3e1070faa 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,66 +3,71 @@ A1,10.0000,r1,2020,r1,residential,gas_stove,newcapa,2020 A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 +A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gas_stove,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2025 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2030 -A1,19.0000,r1,2025,r1,residential,gas_stove,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2030 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,electric_stove,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2030 +A1,11.4063,r1,2025,r1,residential,gas_stove,newcapa,2030 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,electric_stove,newcapa,2035 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,electric_stove,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2035 -A1,3.4062,r1,2030,r1,residential,gas_stove,newcapa,2035 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2035 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,electric_stove,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2040 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2040 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2040 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,electric_stove,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2045 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2045 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2045 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,5.3037,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,electric_stove,newcapa,2050 A1,23.0000,r1,2050,r1,residential,electric_stove,newcapa,2050 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,3.3750,r1,2030,r1,power,gasCCGT,newcapa,2050 -A1,0.1806,r1,2050,r1,power,gasCCGT,newcapa,2050 +A1,5.7500,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,7.4028,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,50.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,18.8125,r1,2040,r1,power,windturbine,newcapa,2050 +A1,34.8125,r1,2035,r1,power,windturbine,newcapa,2050 +A1,12.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,12.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,11.5938,r1,2050,r1,power,windturbine,newcapa,2050 -A1,46.8667,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,9.0279,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,12.0000,r1,2050,r1,power,windturbine,newcapa,2050 +A1,38.5642,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,5.3037,r1,2030,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 e1a14c71f..621b8442b 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 @@ -35,219 +35,219 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,27.5700,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.0747,r1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,27.6461,r1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.1973,r1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.6620,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4047,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.0747,r1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,27.5700,r1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.1973,r1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.6620,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.4046,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.0747,r1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,27.6461,r1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.1973,r1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.6620,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4047,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.0747,r1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,36.3228,r1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.1973,r1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.4462,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6305,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,31.9844,r1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,10.4231,r1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.6620,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.4047,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,21.7330,r1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,10.1973,r1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,14.7846,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.4864,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.6858,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,11.7615,r1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,21.7330,r1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,9.8077,r1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.3067,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.4864,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.3110,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,11.7615,r1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,21.7330,r1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.4330,r1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.7846,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.4864,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.6858,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,11.7615,r1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,21.7330,r1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,9.8077,r1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.3067,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.4864,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.3110,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,11.7615,r1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,33.3662,r1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.4330,r1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,24.0350,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.6642,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.9791,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,12.9394,r1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,27.5496,r1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,12.1010,r1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.1816,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.0753,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.0238,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,12.3504,r1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.9827,r1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,11.1457,r1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.1300,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.2893,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.4494,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,10.9902,r1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,21.2477,r1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,7.4494,r1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.4587,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.7474,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.5809,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.4483,r1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.9827,r1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,7.5809,r1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.1300,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.2893,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.4494,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,10.9902,r1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,21.2477,r1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,7.4494,r1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.4587,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.7474,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.5809,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.4483,r1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,22.5128,r1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,7.5809,r1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.1085,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,12.2056,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.8408,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,11.9065,r1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,21.8803,r1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,11.8408,r1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.2239,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.9765,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.6870,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,11.6774,r1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,19.4632,r1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,8.6870,r1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.2044,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.0792,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,10.3827,r1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,18.8556,r1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,7.0792,r1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.3538,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.1389,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,10.1396,r1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,19.4632,r1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,7.1389,r1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.2044,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.0792,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,10.3827,r1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,18.8556,r1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,7.0792,r1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.3538,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.1389,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,10.1396,r1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,27.7346,r1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,7.1389,r1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.8423,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.9343,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,13.6913,r1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,18.5518,r1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,12.9343,r1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.2777,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.1085,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,10.0181,r1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,19.6913,r1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,9.1085,r1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.8439,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.9350,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,10.4739,r1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,18.1764,r1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,6.9350,r1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.0217,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.4061,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,9.8680,r1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,19.6913,r1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,7.4061,r1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.8439,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.9350,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,10.4739,r1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,18.1764,r1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,6.9350,r1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.0217,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.4061,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,9.8680,r1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,31.0576,r1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,7.4061,r1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.9269,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.7682,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,15.0204,r1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,17.4189,r1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,13.7682,r1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.0625,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.0224,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,9.5650,r1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,20.3427,r1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.0224,r1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.5155,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.8036,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,10.7345,r1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,18.1568,r1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,6.8036,r1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.5501,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.2175,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,9.8601,r1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,20.3427,r1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,7.2175,r1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.5155,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.8036,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,10.7345,r1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,18.1568,r1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,6.8036,r1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.5501,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.2175,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,9.8601,r1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,31.4621,r1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,7.2175,r1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.3147,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.7233,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,15.1822,r1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,19.8197,r1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,14.7233,r1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.9280,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.3686,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,10.5253,r1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,9.3686,r1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv index a14c3c1af..adbf7b8c2 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCASupply.csv @@ -23,177 +23,147 @@ gas,all-week,evening,all-year,r1,2.2500,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,191.1833,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 -gas,all-week,night,all-year,r1,3.0933,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,2.6782,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,152.9467,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,135.4920,0,MUS$2010/kt,2025 cook,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,4.6400,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,4.0173,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,229.4200,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,203.2380,1,MUS$2010/kt,2025 cook,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,3.0933,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,2.6782,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,152.9467,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,135.4920,2,MUS$2010/kt,2025 cook,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,4.6400,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,4.0173,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,229.4200,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,203.2380,3,MUS$2010/kt,2025 cook,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,r1,9.2800,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,8.0346,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,458.8400,4,MUS$2010/kt,2025 +CO2f,all-week,late-peak,all-year,r1,406.4760,4,MUS$2010/kt,2025 cook,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,6.1867,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,5.3564,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,305.8933,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,270.9840,5,MUS$2010/kt,2025 cook,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,r1,0.3375,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,3.4515,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,r1,0.8264,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,2.0048,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,173.7287,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,102.0366,0,MUS$2010/kt,2030 cook,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,r1,0.5062,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,5.1773,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,r1,1.2396,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,3.4299,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,260.5930,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,176.2589,1,MUS$2010/kt,2030 cook,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,r1,0.3375,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,3.4515,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,r1,0.8264,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,2.0048,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,173.7287,2,MUS$2010/kt,2030 +CO2f,all-week,afternoon,all-year,r1,102.0366,2,MUS$2010/kt,2030 cook,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,r1,0.5062,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,5.1773,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,r1,1.2396,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,3.4299,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,260.5930,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,176.2589,3,MUS$2010/kt,2030 cook,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,r1,1.0125,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,9.5092,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,r1,2.4792,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,7.7052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,474.7781,4,MUS$2010/kt,2030 +CO2f,all-week,late-peak,all-year,r1,398.9258,4,MUS$2010/kt,2030 cook,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,r1,0.6750,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,6.6213,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,r1,1.6528,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,4.8550,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,331.9880,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,250.4812,5,MUS$2010/kt,2030 cook,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,r1,1.4486,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,1.2845,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,r1,1.6000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,68.1152,0,MUS$2010/kt,2035 cook,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,r1,2.1729,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,1.5040,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,2.4000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,78.9688,1,MUS$2010/kt,2035 cook,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,r1,1.4486,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,1.2845,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,1.6000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,68.1152,2,MUS$2010/kt,2035 cook,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,r1,2.1729,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,1.5040,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,2.4000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,78.9688,3,MUS$2010/kt,2035 cook,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,r1,4.3458,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,2.1625,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,4.8000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,111.5298,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2035 cook,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,r1,2.8972,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,1.7235,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,3.2000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,r1,0.6228,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,89.8225,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,r1,34.1853,5,MUS$2010/kt,2035 cook,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,1.8667,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2040 cook,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,2.8000,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2040 heat,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2040 cook,all-week,morning,all-year,r1,3.5000,1,MUS$2010/PJ,2040 electricity,all-week,afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2040 heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 -CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2040 cook,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,2.8000,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2040 cook,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2040 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2040 cook,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 electricity,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,r1,0.1774,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2040 +CO2f,all-week,evening,all-year,r1,9.7399,5,MUS$2010/kt,2040 cook,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,2.1333,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,r1,0.8454,0,MUS$2010/PJ,2045 heat,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 -CO2f,all-week,night,all-year,r1,46.4079,0,MUS$2010/kt,2045 cook,all-week,night,all-year,r1,2.6667,0,MUS$2010/PJ,2045 electricity,all-week,morning,all-year,r1,3.2000,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,r1,0.8454,1,MUS$2010/PJ,2045 heat,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 -CO2f,all-week,morning,all-year,r1,46.4079,1,MUS$2010/kt,2045 cook,all-week,morning,all-year,r1,4.0000,1,MUS$2010/PJ,2045 electricity,all-week,afternoon,all-year,r1,2.1333,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,r1,0.8454,2,MUS$2010/PJ,2045 heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 -CO2f,all-week,afternoon,all-year,r1,46.4079,2,MUS$2010/kt,2045 cook,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,3.2000,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,r1,0.8454,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 -CO2f,all-week,early-peak,all-year,r1,46.4079,3,MUS$2010/kt,2045 cook,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,6.4000,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,r1,0.8454,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 -CO2f,all-week,late-peak,all-year,r1,46.4079,4,MUS$2010/kt,2045 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2045 cook,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 electricity,all-week,evening,all-year,r1,4.2667,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,r1,0.8454,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 -CO2f,all-week,evening,all-year,r1,46.4079,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,2.4000,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,r1,0.8907,0,MUS$2010/PJ,2050 heat,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,r1,48.8907,0,MUS$2010/kt,2050 cook,all-week,night,all-year,r1,3.0000,0,MUS$2010/PJ,2050 electricity,all-week,morning,all-year,r1,3.6000,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,r1,0.8907,1,MUS$2010/PJ,2050 heat,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,r1,48.8907,1,MUS$2010/kt,2050 cook,all-week,morning,all-year,r1,4.5000,1,MUS$2010/PJ,2050 electricity,all-week,afternoon,all-year,r1,2.4000,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,r1,0.8907,2,MUS$2010/PJ,2050 heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,r1,48.8907,2,MUS$2010/kt,2050 cook,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,3.6000,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,r1,0.8907,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,r1,48.8907,3,MUS$2010/kt,2050 cook,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,7.2000,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,r1,0.8907,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,3.2948,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,r1,48.8907,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,r1,180.8573,4,MUS$2010/kt,2050 cook,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 electricity,all-week,evening,all-year,r1,4.8000,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,r1,0.8907,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,r1,48.8907,5,MUS$2010/kt,2050 cook,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 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 f826926ac..b12cf3a6d 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 @@ -29,34 +29,34 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,36.1266,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,23.8187,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,19.9620,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.3300,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,33.1319,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,13.9023,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,23.0917,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,19.9620,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.3300,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,36.1266,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,13.9023,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,23.8187,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,19.9620,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.3300,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,33.1319,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,13.9023,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,23.0917,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,19.9620,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.3300,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,30.1372,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,24.8792,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,22.3647,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.6993,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.3300,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,31.6345,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,13.9023,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,22.7282,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,19.9620,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.3300,r1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,12.2840,r1,0,MUS$2010/PJ,2030 @@ -93,29 +93,29 @@ electricity,all-week,night,all-year,11.2242,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,7.5110,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.1500,r1,0,MUS$2010/kt,2035 +CO2f,all-week,night,all-year,0.1700,r1,0,MUS$2010/kt,2035 electricity,all-week,morning,all-year,11.5519,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,9.4163,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.1500,r1,1,MUS$2010/kt,2035 +CO2f,all-week,morning,all-year,0.1700,r1,1,MUS$2010/kt,2035 electricity,all-week,afternoon,all-year,11.2242,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,7.5110,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.1500,r1,2,MUS$2010/kt,2035 +CO2f,all-week,afternoon,all-year,0.1700,r1,2,MUS$2010/kt,2035 electricity,all-week,early-peak,all-year,11.5519,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,9.4163,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.1500,r1,3,MUS$2010/kt,2035 +CO2f,all-week,early-peak,all-year,0.1700,r1,3,MUS$2010/kt,2035 electricity,all-week,late-peak,all-year,28.1123,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,11.3215,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.1500,r1,4,MUS$2010/kt,2035 +CO2f,all-week,late-peak,all-year,0.1700,r1,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,19.2784,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,10.3689,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.1500,r1,5,MUS$2010/kt,2035 +CO2f,all-week,evening,all-year,0.1700,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 1aceb81be..6d4d553c2 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 @@ -17,30 +17,30 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3078,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,72.7310,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,58.9805,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.8364,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,102.2212,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3078,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,88.4707,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,72.7310,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,58.9805,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.8364,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,102.2212,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,88.4707,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.3651,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,131.7114,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,117.9609,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 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 a9a92b5e1..a2de37c7f 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 @@ -29,34 +29,34 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,17.6587,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.8410,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.3110,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.3937,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,15.7240,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,10.6233,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.6795,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.5700,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,17.6587,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,14.5348,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.3110,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.4517,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,15.7240,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,10.6233,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.6795,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.5700,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,13.7892,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,11.4056,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.0480,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.7464,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,14.7566,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,13.3614,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3638,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.1872,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,5.1246,r1,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv index 224c5710e..e720513f6 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCASupply.csv @@ -24,21 +24,21 @@ gas,all-week,evening,all-year,r1,2.2117,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,123.1283,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.1130,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,62.0361,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.6973,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,94.5820,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.2243,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,68.1475,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.6973,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,94.5820,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4502,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 3bbdabe93..f2ded57ca 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv @@ -11,18 +11,18 @@ asset,commodity,day,hour,installed,month,supply,technology,timeslice,year 0,CO2f,all-week,late-peak,2020,all-year,12.2227,gasCCGT,4,2020 0,electricity,all-week,evening,2020,all-year,0.1667,gasCCGT,5,2020 0,CO2f,all-week,evening,2020,all-year,15.2783,gasCCGT,5,2020 -0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +0,electricity,all-week,night,2020,all-year,0.0333,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,3.0557,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,0.1354,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,0.0667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,6.1113,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,0.1865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,0.1000,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,9.1670,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,0.0688,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,0.0667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,6.1113,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,0.1865,windturbine,3,2025 0,electricity,all-week,late-peak,2020,all-year,0.1667,gasCCGT,4,2025 0,CO2f,all-week,late-peak,2020,all-year,15.2783,gasCCGT,4,2025 1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2025 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 d274e03ca..0b297191e 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 @@ -29,34 +29,34 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,18.1462,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,10.4968,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.3727,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.4767,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.0584,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,11.4662,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.7219,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.6767,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,18.1462,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.3130,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.3727,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.6768,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.0584,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,11.4662,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.7219,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.6767,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.9267,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,10.0121,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,10.7456,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.3767,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,13.4486,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,7.5887,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.9083,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.8766,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,4.0308,r1,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv index d0d44e9ca..f6d36fbc5 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCASupply.csv @@ -22,29 +22,29 @@ gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.1130,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,62.0361,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.6973,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,94.5820,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.2243,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,68.1475,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.6973,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,94.5820,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.3110,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,184.5806,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.2537,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,125.6001,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,117.9609,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index f663fab80..93ac891b1 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv @@ -7,24 +7,22 @@ asset,commodity,day,hour,installed,month,supply,technology,timeslice,year 0,CO2f,all-week,afternoon,2020,all-year,9.1670,gasCCGT,2,2020 0,electricity,all-week,early-peak,2020,all-year,0.0667,gasCCGT,3,2020 0,CO2f,all-week,early-peak,2020,all-year,6.1113,gasCCGT,3,2020 -0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +0,electricity,all-week,night,2020,all-year,0.0333,gasCCGT,0,2025 +0,CO2f,all-week,night,2020,all-year,3.0557,gasCCGT,0,2025 +1,electricity,all-week,night,2025,all-year,0.1354,windturbine,0,2025 +0,electricity,all-week,morning,2020,all-year,0.0667,gasCCGT,1,2025 +0,CO2f,all-week,morning,2020,all-year,6.1113,gasCCGT,1,2025 +1,electricity,all-week,morning,2025,all-year,0.1865,windturbine,1,2025 +0,electricity,all-week,afternoon,2020,all-year,0.1000,gasCCGT,2,2025 +0,CO2f,all-week,afternoon,2020,all-year,9.1670,gasCCGT,2,2025 +1,electricity,all-week,afternoon,2025,all-year,0.0688,windturbine,2,2025 +0,electricity,all-week,early-peak,2020,all-year,0.0667,gasCCGT,3,2025 +0,CO2f,all-week,early-peak,2020,all-year,6.1113,gasCCGT,3,2025 +1,electricity,all-week,early-peak,2025,all-year,0.1865,windturbine,3,2025 0,electricity,all-week,late-peak,2020,all-year,0.0833,gasCCGT,4,2025 0,CO2f,all-week,late-peak,2020,all-year,7.6392,gasCCGT,4,2025 1,electricity,all-week,late-peak,2025,all-year,0.4229,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,0.0833,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,7.6392,gasCCGT,5,2025 -1,electricity,all-week,evening,2025,all-year,0.2542,windturbine,5,2025 +1,electricity,all-week,evening,2025,all-year,0.3375,windturbine,5,2025 1,electricity,all-week,night,2025,all-year,0.4132,windturbine,0,2030 1,electricity,all-week,morning,2025,all-year,0.4229,windturbine,1,2030 2,electricity,all-week,morning,2030,all-year,0.1969,windturbine,1,2030 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 a744feeeb..f5f65cf30 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,45 +3,56 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,17.4000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,9.8062,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,17.4000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.0063,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,9.8062,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,10.6000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.0063,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,10.6000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,23.0000,r1,2035,r1,residential,heatpump,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2035 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,23.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,16.2000,r1,2040,r1,residential,heatpump,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2040 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2040 +A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,16.2000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,28.6000,r1,2045,r1,residential,heatpump,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2045 +A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2045 +A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2045 A1,5.6000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,28.6000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,21.8000,r1,2050,r1,residential,heatpump,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,2.3361,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,23.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,8.6063,r1,2040,r1,power,windturbine,newcapa,2050 +A1,15.4062,r1,2035,r1,power,windturbine,newcapa,2050 +A1,5.6000,r1,2040,r1,power,windturbine,newcapa,2050 A1,5.6000,r1,2045,r1,power,windturbine,newcapa,2050 A1,5.6000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,13.8711,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,4.9303,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,9.7199,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.2869,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 94cde9d79..26590c0a1 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 @@ -39,243 +39,243 @@ gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.0346,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.4630,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.7988,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.1498,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,26.4347,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.5616,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.7988,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.2988,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,27.0346,r1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,18.4630,r1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,11.7988,r1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,11.1498,r1,2,MUS$2010/PJ,2025 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,26.4347,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.5616,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.7988,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.2988,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,25.7015,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.9043,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.7988,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.4809,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,26.0348,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.2940,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.7988,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.3981,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,26.0348,r1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,20.2940,r1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,11.7988,r1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,11.3981,r1,6,MUS$2010/PJ,2025 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.1201,r1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,26.0348,r1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,20.2940,r1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,11.7988,r1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,11.3981,r1,7,MUS$2010/PJ,2025 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.1201,r1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.3194,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.5300,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.8971,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.3299,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.3194,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.2103,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.8971,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.7667,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,17.3194,r1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,10.5300,r1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,12.8971,r1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,9.3299,r1,2,MUS$2010/PJ,2030 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.3194,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.2103,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.8971,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.7667,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.3194,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,23.2842,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.8971,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.6449,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.3194,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.6178,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.8971,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.6523,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,17.3194,r1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,15.6178,r1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,12.8971,r1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.6523,r1,6,MUS$2010/PJ,2030 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.1570,r1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,17.3194,r1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,15.6178,r1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,12.8971,r1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.6523,r1,7,MUS$2010/PJ,2030 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.1570,r1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,13.2784,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.5128,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.7163,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.1044,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.1465,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.4686,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.7609,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.4867,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,13.2784,r1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,11.5128,r1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,8.7163,r1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,7.1044,r1,2,MUS$2010/PJ,2035 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.1465,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.4686,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.7609,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.4867,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,19.6519,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.4725,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.0377,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.8882,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.0586,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,13.1058,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.4573,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.7415,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,18.0586,r1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,13.1058,r1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,10.4573,r1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,7.7415,r1,6,MUS$2010/PJ,2035 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.2149,r1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,18.0586,r1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,13.1058,r1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,10.4573,r1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,7.7415,r1,7,MUS$2010/PJ,2035 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.2149,r1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,12.7103,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.2616,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,7.8106,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.0039,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,13.8385,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,11.7868,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,8.9578,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.2140,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,12.7103,r1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,11.2616,r1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,7.8106,r1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,7.0039,r1,2,MUS$2010/PJ,2040 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,13.8385,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,11.7868,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,8.9578,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.2140,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,29.1648,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.1579,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.3600,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.5624,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.5906,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.1577,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,9.7227,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.1623,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,14.5906,r1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,14.1577,r1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,9.7227,r1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,8.1623,r1,6,MUS$2010/PJ,2040 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.2728,r1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,14.5906,r1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,14.1577,r1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,9.7227,r1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,8.1623,r1,7,MUS$2010/PJ,2040 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.2728,r1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.9372,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.9218,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.5833,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.8679,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,12.5385,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.2079,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.0346,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,6.9824,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,11.9372,r1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,10.9218,r1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,7.5833,r1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,6.8679,r1,2,MUS$2010/PJ,2045 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,12.5385,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.2079,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.0346,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,6.9824,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,34.2205,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.1073,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,14.1652,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.7421,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,12.9394,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.4395,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.3355,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.2750,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,12.9394,r1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,14.4395,r1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,8.3355,r1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,8.2750,r1,6,MUS$2010/PJ,2045 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.3539,r1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,12.9394,r1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,14.4395,r1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,8.3355,r1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,8.2750,r1,7,MUS$2010/PJ,2045 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.3539,r1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.5599,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.6129,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.2741,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.7444,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,11.9460,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.0663,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,7.5146,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,6.9258,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,11.5599,r1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,10.6129,r1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,7.2741,r1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,6.7444,r1,2,MUS$2010/PJ,2050 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,11.9460,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.0663,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,7.5146,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,6.9258,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,31.8173,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,32.1457,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,16.1874,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.3575,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.5490,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,13.6543,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.6750,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.9610,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,14.5490,r1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,13.6543,r1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,7.6750,r1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,7.9610,r1,6,MUS$2010/PJ,2050 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.4351,r1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,14.5490,r1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,13.6543,r1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,7.6750,r1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,7.9610,r1,7,MUS$2010/PJ,2050 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.4351,r1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv index abd2f7605..7534cc223 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCASupply.csv @@ -23,94 +23,88 @@ CO2f,all-week,early-morning,all-year,r1,80.8875,6,MUS$2010/kt,2020 gas,all-week,late-afternoon,all-year,r1,1.4500,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,r1,1.2500,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,r1,80.8875,7,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.0827,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1266,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,0.9270,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,60.3960,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,1.5467,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,51.5233,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.1808,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.3243,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.3333,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,86.2800,1,MUS$2010/kt,2025 -gas,all-week,mid-afternoon,all-year,r1,1.0827,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,73.6048,1,MUS$2010/kt,2025 +electricity,all-week,mid-afternoon,all-year,r1,0.1266,2,MUS$2010/PJ,2025 +gas,all-week,mid-afternoon,all-year,r1,0.9270,2,MUS$2010/PJ,2025 heat,all-week,mid-afternoon,all-year,r1,0.9333,2,MUS$2010/PJ,2025 -CO2f,all-week,mid-afternoon,all-year,r1,60.3960,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,1.5467,3,MUS$2010/PJ,2025 +CO2f,all-week,mid-afternoon,all-year,r1,51.5233,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.1808,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.3243,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.3333,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,86.2800,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,3.2480,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,73.6048,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.3797,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,2.7810,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,181.1880,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,2.1653,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,154.5700,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.2531,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,1.8540,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,120.7920,5,MUS$2010/kt,2025 -gas,all-week,early-morning,all-year,r1,2.1653,6,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,r1,103.0467,5,MUS$2010/kt,2025 +electricity,all-week,early-morning,all-year,r1,0.2531,6,MUS$2010/PJ,2025 +gas,all-week,early-morning,all-year,r1,1.8540,6,MUS$2010/PJ,2025 heat,all-week,early-morning,all-year,r1,1.8667,6,MUS$2010/PJ,2025 -CO2f,all-week,early-morning,all-year,r1,120.7920,6,MUS$2010/kt,2025 -gas,all-week,late-afternoon,all-year,r1,2.1653,7,MUS$2010/PJ,2025 +CO2f,all-week,early-morning,all-year,r1,103.0467,6,MUS$2010/kt,2025 +electricity,all-week,late-afternoon,all-year,r1,0.2531,7,MUS$2010/PJ,2025 +gas,all-week,late-afternoon,all-year,r1,1.8540,7,MUS$2010/PJ,2025 heat,all-week,late-afternoon,all-year,r1,1.8667,7,MUS$2010/PJ,2025 -CO2f,all-week,late-afternoon,all-year,r1,120.7920,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1266,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.9863,0,MUS$2010/PJ,2030 +CO2f,all-week,late-afternoon,all-year,r1,103.0467,7,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.3032,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.4740,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.1667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,55.0204,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.1808,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.4090,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,26.4401,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.4332,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,0.7664,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.6667,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,78.6005,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,r1,0.1266,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,r1,0.9863,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,42.6756,1,MUS$2010/kt,2030 +electricity,all-week,mid-afternoon,all-year,r1,0.3032,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,r1,0.4740,2,MUS$2010/PJ,2030 heat,all-week,mid-afternoon,all-year,r1,1.1667,2,MUS$2010/PJ,2030 -CO2f,all-week,mid-afternoon,all-year,r1,55.0204,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.1808,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.4090,3,MUS$2010/PJ,2030 +CO2f,all-week,mid-afternoon,all-year,r1,26.4401,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.4332,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,0.7664,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.6667,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,78.6005,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.3797,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.9589,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,42.6756,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.9097,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.3070,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,3.5000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,165.0611,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.2531,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.9726,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,127.9054,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.6065,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.3266,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,2.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,110.0407,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,r1,0.2531,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,r1,1.9726,6,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,73.6683,5,MUS$2010/kt,2030 +electricity,all-week,early-morning,all-year,r1,0.6065,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,r1,1.3266,6,MUS$2010/PJ,2030 heat,all-week,early-morning,all-year,r1,2.3333,6,MUS$2010/PJ,2030 -CO2f,all-week,early-morning,all-year,r1,110.0407,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,r1,0.2531,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,r1,1.9726,7,MUS$2010/PJ,2030 +CO2f,all-week,early-morning,all-year,r1,73.6683,6,MUS$2010/kt,2030 +electricity,all-week,late-afternoon,all-year,r1,0.6065,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,r1,1.3266,7,MUS$2010/PJ,2030 heat,all-week,late-afternoon,all-year,r1,2.3333,7,MUS$2010/PJ,2030 -CO2f,all-week,late-afternoon,all-year,r1,110.0407,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.5099,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.1453,0,MUS$2010/PJ,2035 +CO2f,all-week,late-afternoon,all-year,r1,73.6683,7,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.5600,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,1.4000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,8.1056,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,0.7284,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.2076,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,0.8000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,11.5794,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,r1,0.5099,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,r1,0.1453,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,r1,0.5600,2,MUS$2010/PJ,2035 heat,all-week,mid-afternoon,all-year,r1,1.4000,2,MUS$2010/PJ,2035 -CO2f,all-week,mid-afternoon,all-year,r1,8.1056,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,0.7284,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.2076,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,0.8000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,11.5794,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,1.5297,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.4359,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,1.6800,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,4.2000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,24.3168,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.0198,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.2906,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.1200,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.8000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,16.2112,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,r1,1.0198,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,r1,0.2906,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,r1,1.1200,6,MUS$2010/PJ,2035 heat,all-week,early-morning,all-year,r1,2.8000,6,MUS$2010/PJ,2035 -CO2f,all-week,early-morning,all-year,r1,16.2112,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,r1,1.0198,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,r1,0.2906,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,r1,1.1200,7,MUS$2010/PJ,2035 heat,all-week,late-afternoon,all-year,r1,2.8000,7,MUS$2010/PJ,2035 -CO2f,all-week,late-afternoon,all-year,r1,16.2112,7,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.6533,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,1.6333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,0.9333,1,MUS$2010/PJ,2040 @@ -120,7 +114,9 @@ heat,all-week,mid-afternoon,all-year,r1,1.6333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,0.9333,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,2.3333,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,1.9600,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,4.9000,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.3067,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,3.2667,5,MUS$2010/PJ,2040 electricity,all-week,early-morning,all-year,r1,1.3067,6,MUS$2010/PJ,2040 @@ -136,7 +132,9 @@ heat,all-week,mid-afternoon,all-year,r1,1.8667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,1.0667,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,2.6667,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,2.2400,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,5.6000,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,1.4933,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,3.7333,5,MUS$2010/PJ,2045 electricity,all-week,early-morning,all-year,r1,1.4933,6,MUS$2010/PJ,2045 @@ -152,7 +150,9 @@ heat,all-week,mid-afternoon,all-year,r1,2.1000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,2.5200,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.8851,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,6.3000,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,48.5851,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,1.6800,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,4.2000,5,MUS$2010/PJ,2050 electricity,all-week,early-morning,all-year,r1,1.6800,6,MUS$2010/PJ,2050 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 c13ac84b7..dcc3b8503 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 @@ -199,163 +199,163 @@ gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2028 heat,all-week,late-afternoon,all-year,13.0777,r1,7,MUS$2010/PJ,2028 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.1422,r1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,21.5841,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6665,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.6360,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.8464,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,21.8163,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,11.5897,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.6528,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.9132,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,21.5841,r1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,10.6665,r1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,13.6360,r1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,12.8464,r1,2,MUS$2010/PJ,2030 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,21.8163,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,11.5897,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.6528,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.9132,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,32.4804,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.9982,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.4240,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,13.7383,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,25.8637,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.2825,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.9455,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,13.1803,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,25.8637,r1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,15.2825,r1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,13.9455,r1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,13.1803,r1,6,MUS$2010/PJ,2030 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.1570,r1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,25.8637,r1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,15.2825,r1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,13.9455,r1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,13.1803,r1,7,MUS$2010/PJ,2030 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.1570,r1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,23.7425,r1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,10.5163,r1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,14.2965,r1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,12.3038,r1,0,MUS$2010/PJ,2032 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.1802,r1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,23.9393,r1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,11.6975,r1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,14.3262,r1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,12.4817,r1,1,MUS$2010/PJ,2032 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.1802,r1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,23.7425,r1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,10.5163,r1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,14.2965,r1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,12.3038,r1,2,MUS$2010/PJ,2032 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.1802,r1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,23.9393,r1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,11.6975,r1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,14.3262,r1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,12.4817,r1,3,MUS$2010/PJ,2032 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.1802,r1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,38.9688,r1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,24.4582,r1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,16.5907,r1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,14.4044,r1,4,MUS$2010/PJ,2032 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.1802,r1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,24.9653,r1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,15.9156,r1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,14.4808,r1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,13.1173,r1,5,MUS$2010/PJ,2032 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.1802,r1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,24.9653,r1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,15.9156,r1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,14.4808,r1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,13.1173,r1,6,MUS$2010/PJ,2032 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.1802,r1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,24.9653,r1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,15.9156,r1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,14.4808,r1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,13.1173,r1,7,MUS$2010/PJ,2032 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.1802,r1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,25.6744,r1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,10.7343,r1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,14.7552,r1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.4671,r1,0,MUS$2010/PJ,2034 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.2033,r1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,22.8550,r1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,11.9814,r1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,14.1347,r1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.7416,r1,1,MUS$2010/PJ,2034 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.2033,r1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,25.6744,r1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,10.7343,r1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,14.7552,r1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.4671,r1,2,MUS$2010/PJ,2034 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.2033,r1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,22.8550,r1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,11.9814,r1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,14.1347,r1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.7416,r1,3,MUS$2010/PJ,2034 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.2033,r1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,38.2894,r1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,23.4679,r1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,17.5315,r1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,14.2696,r1,4,MUS$2010/PJ,2034 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.2033,r1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,23.4209,r1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,13.6084,r1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,14.2592,r1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,12.0997,r1,5,MUS$2010/PJ,2034 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.2033,r1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,23.4209,r1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,13.6084,r1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,14.2592,r1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,12.0997,r1,6,MUS$2010/PJ,2034 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.2033,r1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,23.4209,r1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,13.6084,r1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,14.2592,r1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,12.0997,r1,7,MUS$2010/PJ,2034 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.2033,r1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,24.3238,r1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,10.5588,r1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,14.1563,r1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,10.2947,r1,0,MUS$2010/PJ,2036 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.2265,r1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,20.9410,r1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,11.0615,r1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,13.2073,r1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,10.4358,r1,1,MUS$2010/PJ,2036 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.2265,r1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,24.3238,r1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,10.5588,r1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,14.1563,r1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,10.2947,r1,2,MUS$2010/PJ,2036 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.2265,r1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,20.9410,r1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,11.0615,r1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,13.2073,r1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,10.4358,r1,3,MUS$2010/PJ,2036 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.2265,r1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,37.6219,r1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,23.9949,r1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,17.8869,r1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,14.0640,r1,4,MUS$2010/PJ,2036 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.2265,r1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,22.0108,r1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,14.8160,r1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,13.5074,r1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,11.4890,r1,5,MUS$2010/PJ,2036 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.2265,r1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,22.0108,r1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,14.8160,r1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,13.5074,r1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,11.4890,r1,6,MUS$2010/PJ,2036 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.2265,r1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,22.0108,r1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,14.8160,r1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,13.5074,r1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,11.4890,r1,7,MUS$2010/PJ,2036 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.2265,r1,7,MUS$2010/kt,2036 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv index 2f1846078..a7cbf7e19 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCASupply.csv @@ -128,130 +128,130 @@ gas,all-week,late-afternoon,all-year,r1,2.3979,7,MUS$2010/PJ,2028 heat,all-week,late-afternoon,all-year,r1,2.1467,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,r1,133.6529,7,MUS$2010/kt,2028 electricity,all-week,night,all-year,r1,0.0844,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.2496,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,1.1086,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.1667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,69.5799,0,MUS$2010/kt,2030 +CO2f,all-week,night,all-year,r1,61.8452,0,MUS$2010/kt,2030 electricity,all-week,morning,all-year,r1,0.1205,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.7851,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.5972,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.6667,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,99.3998,1,MUS$2010/kt,2030 +CO2f,all-week,morning,all-year,r1,89.0870,1,MUS$2010/kt,2030 electricity,all-week,mid-afternoon,all-year,r1,0.0844,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,r1,1.2496,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,r1,1.1086,2,MUS$2010/PJ,2030 heat,all-week,mid-afternoon,all-year,r1,1.1667,2,MUS$2010/PJ,2030 -CO2f,all-week,mid-afternoon,all-year,r1,69.5799,2,MUS$2010/kt,2030 +CO2f,all-week,mid-afternoon,all-year,r1,61.8452,2,MUS$2010/kt,2030 electricity,all-week,early-peak,all-year,r1,0.1205,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.7851,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.5972,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.6667,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,99.3998,3,MUS$2010/kt,2030 +CO2f,all-week,early-peak,all-year,r1,89.0870,3,MUS$2010/kt,2030 electricity,all-week,late-peak,all-year,r1,0.2531,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,r1,3.5608,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,3.5000,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,r1,198.4268,4,MUS$2010/kt,2030 electricity,all-week,evening,all-year,r1,0.1688,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.4521,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.3112,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,2.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,136.5816,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,128.8469,5,MUS$2010/kt,2030 electricity,all-week,early-morning,all-year,r1,0.1688,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,r1,2.4521,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,r1,2.3112,6,MUS$2010/PJ,2030 heat,all-week,early-morning,all-year,r1,2.3333,6,MUS$2010/PJ,2030 -CO2f,all-week,early-morning,all-year,r1,136.5816,6,MUS$2010/kt,2030 +CO2f,all-week,early-morning,all-year,r1,128.8469,6,MUS$2010/kt,2030 electricity,all-week,late-afternoon,all-year,r1,0.1688,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,r1,2.4521,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,r1,2.3112,7,MUS$2010/PJ,2030 heat,all-week,late-afternoon,all-year,r1,2.3333,7,MUS$2010/PJ,2030 -CO2f,all-week,late-afternoon,all-year,r1,136.5816,7,MUS$2010/kt,2030 +CO2f,all-week,late-afternoon,all-year,r1,128.8469,7,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.1898,0,MUS$2010/PJ,2032 -gas,all-week,night,all-year,r1,1.2281,0,MUS$2010/PJ,2032 +gas,all-week,night,all-year,r1,0.9111,0,MUS$2010/PJ,2032 heat,all-week,night,all-year,r1,1.2600,0,MUS$2010/PJ,2032 -CO2f,all-week,night,all-year,r1,68.2256,0,MUS$2010/kt,2032 +CO2f,all-week,night,all-year,r1,50.8226,0,MUS$2010/kt,2032 electricity,all-week,morning,all-year,r1,0.2712,1,MUS$2010/PJ,2032 -gas,all-week,morning,all-year,r1,1.7544,1,MUS$2010/PJ,2032 +gas,all-week,morning,all-year,r1,1.3317,1,MUS$2010/PJ,2032 heat,all-week,morning,all-year,r1,1.8000,1,MUS$2010/PJ,2032 -CO2f,all-week,morning,all-year,r1,97.4651,1,MUS$2010/kt,2032 +CO2f,all-week,morning,all-year,r1,74.2612,1,MUS$2010/kt,2032 electricity,all-week,mid-afternoon,all-year,r1,0.1898,2,MUS$2010/PJ,2032 -gas,all-week,mid-afternoon,all-year,r1,1.2281,2,MUS$2010/PJ,2032 +gas,all-week,mid-afternoon,all-year,r1,0.9111,2,MUS$2010/PJ,2032 heat,all-week,mid-afternoon,all-year,r1,1.2600,2,MUS$2010/PJ,2032 -CO2f,all-week,mid-afternoon,all-year,r1,68.2256,2,MUS$2010/kt,2032 +CO2f,all-week,mid-afternoon,all-year,r1,50.8226,2,MUS$2010/kt,2032 electricity,all-week,early-peak,all-year,r1,0.2712,3,MUS$2010/PJ,2032 -gas,all-week,early-peak,all-year,r1,1.7544,3,MUS$2010/PJ,2032 +gas,all-week,early-peak,all-year,r1,1.3317,3,MUS$2010/PJ,2032 heat,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2032 -CO2f,all-week,early-peak,all-year,r1,97.4651,3,MUS$2010/kt,2032 +CO2f,all-week,early-peak,all-year,r1,74.2612,3,MUS$2010/kt,2032 electricity,all-week,late-peak,all-year,r1,0.5695,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,r1,3.2616,4,MUS$2010/PJ,2032 heat,all-week,late-peak,all-year,r1,3.7800,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,r1,181.4728,4,MUS$2010/kt,2032 electricity,all-week,evening,all-year,r1,0.3797,5,MUS$2010/PJ,2032 -gas,all-week,evening,all-year,r1,2.3505,5,MUS$2010/PJ,2032 +gas,all-week,evening,all-year,r1,2.0335,5,MUS$2010/PJ,2032 heat,all-week,evening,all-year,r1,2.5200,5,MUS$2010/PJ,2032 -CO2f,all-week,evening,all-year,r1,130.6502,5,MUS$2010/kt,2032 +CO2f,all-week,evening,all-year,r1,113.2472,5,MUS$2010/kt,2032 electricity,all-week,early-morning,all-year,r1,0.3797,6,MUS$2010/PJ,2032 -gas,all-week,early-morning,all-year,r1,2.3505,6,MUS$2010/PJ,2032 +gas,all-week,early-morning,all-year,r1,2.0335,6,MUS$2010/PJ,2032 heat,all-week,early-morning,all-year,r1,2.5200,6,MUS$2010/PJ,2032 -CO2f,all-week,early-morning,all-year,r1,130.6502,6,MUS$2010/kt,2032 +CO2f,all-week,early-morning,all-year,r1,113.2472,6,MUS$2010/kt,2032 electricity,all-week,late-afternoon,all-year,r1,0.3797,7,MUS$2010/PJ,2032 -gas,all-week,late-afternoon,all-year,r1,2.3505,7,MUS$2010/PJ,2032 +gas,all-week,late-afternoon,all-year,r1,2.0335,7,MUS$2010/PJ,2032 heat,all-week,late-afternoon,all-year,r1,2.5200,7,MUS$2010/PJ,2032 -CO2f,all-week,late-afternoon,all-year,r1,130.6502,7,MUS$2010/kt,2032 +CO2f,all-week,late-afternoon,all-year,r1,113.2472,7,MUS$2010/kt,2032 electricity,all-week,night,all-year,r1,0.2978,0,MUS$2010/PJ,2034 -gas,all-week,night,all-year,r1,1.2035,0,MUS$2010/PJ,2034 +gas,all-week,night,all-year,r1,0.7061,0,MUS$2010/PJ,2034 heat,all-week,night,all-year,r1,1.3533,0,MUS$2010/PJ,2034 -CO2f,all-week,night,all-year,r1,66.6939,0,MUS$2010/kt,2034 +CO2f,all-week,night,all-year,r1,39.3905,0,MUS$2010/kt,2034 electricity,all-week,morning,all-year,r1,0.4255,1,MUS$2010/PJ,2034 -gas,all-week,morning,all-year,r1,1.5498,1,MUS$2010/PJ,2034 +gas,all-week,morning,all-year,r1,1.0087,1,MUS$2010/PJ,2034 heat,all-week,morning,all-year,r1,1.9333,1,MUS$2010/PJ,2034 -CO2f,all-week,morning,all-year,r1,85.9733,1,MUS$2010/kt,2034 +CO2f,all-week,morning,all-year,r1,56.2722,1,MUS$2010/kt,2034 electricity,all-week,mid-afternoon,all-year,r1,0.2978,2,MUS$2010/PJ,2034 -gas,all-week,mid-afternoon,all-year,r1,1.2035,2,MUS$2010/PJ,2034 +gas,all-week,mid-afternoon,all-year,r1,0.7061,2,MUS$2010/PJ,2034 heat,all-week,mid-afternoon,all-year,r1,1.3533,2,MUS$2010/PJ,2034 -CO2f,all-week,mid-afternoon,all-year,r1,66.6939,2,MUS$2010/kt,2034 +CO2f,all-week,mid-afternoon,all-year,r1,39.3905,2,MUS$2010/kt,2034 electricity,all-week,early-peak,all-year,r1,0.4255,3,MUS$2010/PJ,2034 -gas,all-week,early-peak,all-year,r1,1.5498,3,MUS$2010/PJ,2034 +gas,all-week,early-peak,all-year,r1,1.0087,3,MUS$2010/PJ,2034 heat,all-week,early-peak,all-year,r1,1.9333,3,MUS$2010/PJ,2034 -CO2f,all-week,early-peak,all-year,r1,85.9733,3,MUS$2010/kt,2034 +CO2f,all-week,early-peak,all-year,r1,56.2722,3,MUS$2010/kt,2034 electricity,all-week,late-peak,all-year,r1,0.8935,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,r1,2.6594,4,MUS$2010/PJ,2034 heat,all-week,late-peak,all-year,r1,4.0600,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,r1,147.8727,4,MUS$2010/kt,2034 electricity,all-week,evening,all-year,r1,0.5957,5,MUS$2010/PJ,2034 -gas,all-week,evening,all-year,r1,1.9533,5,MUS$2010/PJ,2034 +gas,all-week,evening,all-year,r1,1.4559,5,MUS$2010/PJ,2034 heat,all-week,evening,all-year,r1,2.7067,5,MUS$2010/PJ,2034 -CO2f,all-week,evening,all-year,r1,108.4821,5,MUS$2010/kt,2034 +CO2f,all-week,evening,all-year,r1,81.1788,5,MUS$2010/kt,2034 electricity,all-week,early-morning,all-year,r1,0.5957,6,MUS$2010/PJ,2034 -gas,all-week,early-morning,all-year,r1,1.9533,6,MUS$2010/PJ,2034 +gas,all-week,early-morning,all-year,r1,1.4559,6,MUS$2010/PJ,2034 heat,all-week,early-morning,all-year,r1,2.7067,6,MUS$2010/PJ,2034 -CO2f,all-week,early-morning,all-year,r1,108.4821,6,MUS$2010/kt,2034 +CO2f,all-week,early-morning,all-year,r1,81.1788,6,MUS$2010/kt,2034 electricity,all-week,late-afternoon,all-year,r1,0.5957,7,MUS$2010/PJ,2034 -gas,all-week,late-afternoon,all-year,r1,1.9533,7,MUS$2010/PJ,2034 +gas,all-week,late-afternoon,all-year,r1,1.4559,7,MUS$2010/PJ,2034 heat,all-week,late-afternoon,all-year,r1,2.7067,7,MUS$2010/PJ,2034 -CO2f,all-week,late-afternoon,all-year,r1,108.4821,7,MUS$2010/kt,2034 +CO2f,all-week,late-afternoon,all-year,r1,81.1788,7,MUS$2010/kt,2034 electricity,all-week,night,all-year,r1,0.4058,0,MUS$2010/PJ,2036 -gas,all-week,night,all-year,r1,1.0423,0,MUS$2010/PJ,2036 +gas,all-week,night,all-year,r1,0.5012,0,MUS$2010/PJ,2036 heat,all-week,night,all-year,r1,1.4467,0,MUS$2010/PJ,2036 -CO2f,all-week,night,all-year,r1,57.6595,0,MUS$2010/kt,2036 +CO2f,all-week,night,all-year,r1,27.9584,0,MUS$2010/kt,2036 electricity,all-week,morning,all-year,r1,0.5798,1,MUS$2010/PJ,2036 -gas,all-week,morning,all-year,r1,1.2571,1,MUS$2010/PJ,2036 +gas,all-week,morning,all-year,r1,0.7160,1,MUS$2010/PJ,2036 heat,all-week,morning,all-year,r1,2.0667,1,MUS$2010/PJ,2036 -CO2f,all-week,morning,all-year,r1,69.6417,1,MUS$2010/kt,2036 +CO2f,all-week,morning,all-year,r1,39.9406,1,MUS$2010/kt,2036 electricity,all-week,mid-afternoon,all-year,r1,0.4058,2,MUS$2010/PJ,2036 -gas,all-week,mid-afternoon,all-year,r1,1.0423,2,MUS$2010/PJ,2036 +gas,all-week,mid-afternoon,all-year,r1,0.5012,2,MUS$2010/PJ,2036 heat,all-week,mid-afternoon,all-year,r1,1.4467,2,MUS$2010/PJ,2036 -CO2f,all-week,mid-afternoon,all-year,r1,57.6595,2,MUS$2010/kt,2036 +CO2f,all-week,mid-afternoon,all-year,r1,27.9584,2,MUS$2010/kt,2036 electricity,all-week,early-peak,all-year,r1,0.5798,3,MUS$2010/PJ,2036 -gas,all-week,early-peak,all-year,r1,1.2571,3,MUS$2010/PJ,2036 +gas,all-week,early-peak,all-year,r1,0.7160,3,MUS$2010/PJ,2036 heat,all-week,early-peak,all-year,r1,2.0667,3,MUS$2010/PJ,2036 -CO2f,all-week,early-peak,all-year,r1,69.6417,3,MUS$2010/kt,2036 +CO2f,all-week,early-peak,all-year,r1,39.9406,3,MUS$2010/kt,2036 electricity,all-week,late-peak,all-year,r1,1.2175,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,r1,2.0446,4,MUS$2010/PJ,2036 heat,all-week,late-peak,all-year,r1,4.3400,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,r1,113.5764,4,MUS$2010/kt,2036 electricity,all-week,evening,all-year,r1,0.8117,5,MUS$2010/PJ,2036 -gas,all-week,evening,all-year,r1,1.5435,5,MUS$2010/PJ,2036 +gas,all-week,evening,all-year,r1,1.0024,5,MUS$2010/PJ,2036 heat,all-week,evening,all-year,r1,2.8933,5,MUS$2010/PJ,2036 -CO2f,all-week,evening,all-year,r1,85.6179,5,MUS$2010/kt,2036 +CO2f,all-week,evening,all-year,r1,55.9169,5,MUS$2010/kt,2036 electricity,all-week,early-morning,all-year,r1,0.8117,6,MUS$2010/PJ,2036 -gas,all-week,early-morning,all-year,r1,1.5435,6,MUS$2010/PJ,2036 +gas,all-week,early-morning,all-year,r1,1.0024,6,MUS$2010/PJ,2036 heat,all-week,early-morning,all-year,r1,2.8933,6,MUS$2010/PJ,2036 -CO2f,all-week,early-morning,all-year,r1,85.6179,6,MUS$2010/kt,2036 +CO2f,all-week,early-morning,all-year,r1,55.9169,6,MUS$2010/kt,2036 electricity,all-week,late-afternoon,all-year,r1,0.8117,7,MUS$2010/PJ,2036 -gas,all-week,late-afternoon,all-year,r1,1.5435,7,MUS$2010/PJ,2036 +gas,all-week,late-afternoon,all-year,r1,1.0024,7,MUS$2010/PJ,2036 heat,all-week,late-afternoon,all-year,r1,2.8933,7,MUS$2010/PJ,2036 -CO2f,all-week,late-afternoon,all-year,r1,85.6179,7,MUS$2010/kt,2036 +CO2f,all-week,late-afternoon,all-year,r1,55.9169,7,MUS$2010/kt,2036 diff --git a/docs/user-guide/add-agent.ipynb b/docs/user-guide/add-agent.ipynb index fe6957472..83badaa4e 100644 --- a/docs/user-guide/add-agent.ipynb +++ b/docs/user-guide/add-agent.ipynb @@ -195,7 +195,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -209,7 +209,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/add-gdp-correlation-demand.ipynb b/docs/user-guide/add-gdp-correlation-demand.ipynb index bc001d648..a1e1790d0 100644 --- a/docs/user-guide/add-gdp-correlation-demand.ipynb +++ b/docs/user-guide/add-gdp-correlation-demand.ipynb @@ -165,7 +165,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -179,7 +179,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/add-region.ipynb b/docs/user-guide/add-region.ipynb index fcc9c22b1..2839412c0 100644 --- a/docs/user-guide/add-region.ipynb +++ b/docs/user-guide/add-region.ipynb @@ -149,7 +149,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -163,7 +163,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/additional-service-demand.ipynb b/docs/user-guide/additional-service-demand.ipynb index ce3360e12..baed32001 100644 --- a/docs/user-guide/additional-service-demand.ipynb +++ b/docs/user-guide/additional-service-demand.ipynb @@ -183,7 +183,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -197,7 +197,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/carbon-budget.ipynb b/docs/user-guide/carbon-budget.ipynb index 0c5d0ada1..bd4a120e2 100644 --- a/docs/user-guide/carbon-budget.ipynb +++ b/docs/user-guide/carbon-budget.ipynb @@ -153,7 +153,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -167,7 +167,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb index 7fb114eac..b8224dd65 100644 --- a/docs/user-guide/min-max-timeslice-constraints.ipynb +++ b/docs/user-guide/min-max-timeslice-constraints.ipynb @@ -234,7 +234,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -248,7 +248,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb index 2b35bc6d3..acdc07f92 100644 --- a/docs/user-guide/modify-timing-data.ipynb +++ b/docs/user-guide/modify-timing-data.ipynb @@ -200,7 +200,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -214,7 +214,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/docs/user-guide/subsectors.ipynb b/docs/user-guide/subsectors.ipynb index 3e44dea15..2ffbcd427 100644 --- a/docs/user-guide/subsectors.ipynb +++ b/docs/user-guide/subsectors.ipynb @@ -208,7 +208,7 @@ ], "metadata": { "kernelspec": { - "display_name": "muse_env", + "display_name": ".venv", "language": "python", "name": "python3" }, @@ -222,7 +222,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.11" + "version": "3.12.13" } }, "nbformat": 4, diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 53ca36863..550520759 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -3,45 +3,56 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2030 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2035 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2040 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2045 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,2.5139,r1,2030,r1,power,gasCCGT,newcapa,2050 A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.7821,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,3.5837,r1,2030,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index e5580eeac..28f45bcec 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.2610,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.9189,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.4372,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.5272,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.2610,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.9189,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.4372,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.3107,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6133,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,20.6148,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.5253,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.6526,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.6614,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,13.3053,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.3190,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.6526,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.6614,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,13.3053,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.3190,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,22.2482,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.5361,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.2622,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.0521,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,12.3730,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5466,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,13.7363,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.0919,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,12.3730,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5466,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,13.7363,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.0919,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.4125,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.5624,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.4179,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.3646,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.8440,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.3350,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.5727,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.6265,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.8440,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.3350,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.5727,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.6265,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.3063,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.7200,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.7195,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.8852,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.2443,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,7.0951,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,11.6190,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.2450,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.2443,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,7.0951,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,11.6190,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.2450,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.4247,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.9673,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.3328,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.1306,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.8948,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.9553,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,11.9238,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.3669,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.8948,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.9553,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,11.9238,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.3669,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.2733,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.7068,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.9882,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.9927,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default/Results/MCASupply.csv b/tests/example_outputs/default/Results/MCASupply.csv index 101c2f4e0..80a7737d3 100644 --- a/tests/example_outputs/default/Results/MCASupply.csv +++ b/tests/example_outputs/default/Results/MCASupply.csv @@ -17,72 +17,68 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.3391,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,74.4498,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,2.0087,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,111.6747,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.3391,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,74.4498,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,2.0087,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,111.6747,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,4.0173,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,223.3493,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.6782,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,148.8996,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.2922,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,71.9166,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.2922,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,71.9166,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,3.4299,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,190.2411,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,2.0048,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,111.3581,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 @@ -92,7 +88,9 @@ heat,all-week,afternoon,all-year,r1,2.3333,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,1.4000,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,3.5000,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,2.8000,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,7.0000,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,1.8667,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,4.6667,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,1.0667,0,MUS$2010/PJ,2045 @@ -104,7 +102,9 @@ heat,all-week,afternoon,all-year,r1,2.6667,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,1.6000,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,4.0000,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,3.2000,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,8.0000,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,2.1333,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,5.3333,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,1.2000,0,MUS$2010/PJ,2050 @@ -116,6 +116,8 @@ heat,all-week,afternoon,all-year,r1,3.0000,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,1.8000,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,4.5000,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,3.6000,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,1.2247,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,9.0000,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,67.2247,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,2.4000,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,6.0000,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 53ca36863..282a08bb2 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -3,45 +3,45 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,19.0000,r1,2025,r1,residential,gasboiler,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2030 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,11.4063,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2030 +A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2030 +A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2030 -A1,3.4062,r1,2030,r1,residential,gasboiler,newcapa,2035 -A1,7.5938,r1,2030,r1,residential,heatpump,newcapa,2035 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2030 +A1,11.0000,r1,2030,r1,residential,heatpump,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2035 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2035 +A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2035 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2035 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2035 A1,25.0000,r1,2035,r1,residential,heatpump,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2040 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2040 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2040 +A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2040 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2040 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2040 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2040 A1,17.0000,r1,2040,r1,residential,heatpump,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2045 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2045 +A1,5.3438,r1,2025,r1,power,windturbine,newcapa,2045 +A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2045 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2045 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2045 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2045 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2045 A1,31.0000,r1,2045,r1,residential,heatpump,newcapa,2050 A1,23.0000,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 -A1,25.0000,r1,2035,r1,power,windturbine,newcapa,2050 -A1,9.4062,r1,2040,r1,power,windturbine,newcapa,2050 +A1,13.2500,r1,2030,r1,power,windturbine,newcapa,2050 +A1,17.4063,r1,2035,r1,power,windturbine,newcapa,2050 +A1,6.0000,r1,2040,r1,power,windturbine,newcapa,2050 A1,6.0000,r1,2045,r1,power,windturbine,newcapa,2050 -A1,6.0000,r1,2050,r1,power,windturbine,newcapa,2050 -A1,15.9333,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,5.4458,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,11.3438,r1,2050,r1,power,windturbine,newcapa,2050 +A1,7.8158,r1,2025,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index e5580eeac..1e0a6f311 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2688,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.6757,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2267,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,13.9023,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.6757,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2688,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,13.9023,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.6757,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2267,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,13.9023,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.6757,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.1846,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.1772,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.6913,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2056,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,13.9023,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.6757,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,17.9998,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.2840,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.1084,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.0658,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,17.9998,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.0471,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.1084,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.2467,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,17.9998,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.2840,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.1084,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.0658,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,17.9998,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.0471,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.1084,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.2467,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,17.9998,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.8103,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,13.1084,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.4276,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,17.9998,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.4287,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,13.1084,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.8371,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,14.1478,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.2242,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.1762,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,7.5110,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.3578,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,11.5519,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.3387,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.4163,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,14.1478,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.2242,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.1762,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,7.5110,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.3578,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,11.5519,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.3387,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.4163,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,20.5678,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,28.1123,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.5012,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.3215,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,18.9628,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.2784,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.9199,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.3689,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,13.4961,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.8078,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.2565,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,7.0871,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,14.8775,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,13.4624,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.5405,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.2182,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,13.4961,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.8078,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.2565,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,7.0871,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,14.8775,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,13.4624,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.5405,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.2182,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,25.7456,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,27.0966,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,10.8245,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.8424,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.5682,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.3526,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.1825,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.3088,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,12.7039,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.4648,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.9958,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.9205,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,13.5181,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,13.7844,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,8.5484,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.9824,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,12.7039,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.4648,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.9958,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.9205,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,13.5181,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,13.7844,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,8.5484,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.9824,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,28.7284,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,28.1645,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,12.8956,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.4360,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.9252,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.6108,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.8247,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.9385,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,12.1291,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.1987,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.6790,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.7833,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,12.6470,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.3135,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.0047,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.1112,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,12.1291,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.1987,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.6790,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.7833,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,12.6470,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.3135,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.0047,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.1112,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,28.7468,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.9381,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,14.0888,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.8632,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,15.7791,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.4228,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.1675,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.2417,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCASupply.csv b/tests/example_outputs/default_adhoc/Results/MCASupply.csv index 101c2f4e0..432408f87 100644 --- a/tests/example_outputs/default_adhoc/Results/MCASupply.csv +++ b/tests/example_outputs/default_adhoc/Results/MCASupply.csv @@ -17,72 +17,66 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.5467,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,86.2800,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,2.3200,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,58.9805,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,129.4200,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.5467,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,88.4707,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,86.2800,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,2.3200,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,58.9805,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,129.4200,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,4.6400,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,88.4707,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,3.4224,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,258.8400,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,3.0933,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,190.6919,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,172.5600,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1687,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,1.4440,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,117.9609,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,80.5505,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,2.1659,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,41.0055,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.6198,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,1.1026,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,2.5000,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,120.8257,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1687,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,1.4440,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,61.5082,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.4132,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.7351,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,1.6667,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,80.5505,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,2.1659,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,41.0055,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.6198,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,1.1026,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,2.5000,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,120.8257,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,4.3319,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,61.5082,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,1.2396,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,2.2052,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,5.0000,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,241.6514,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,2.8879,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,123.0164,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.8264,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,1.4701,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,3.3333,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,161.1009,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,r1,0.7243,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,r1,0.2195,0,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,r1,82.0109,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,r1,0.8000,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,2.0000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,r1,12.2455,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,r1,1.0865,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,r1,0.3293,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,r1,1.2000,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,r1,3.0000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,r1,18.3682,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,r1,0.7243,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,r1,0.2195,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,r1,0.8000,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,r1,2.0000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,r1,12.2455,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,r1,1.0865,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,r1,0.3293,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,r1,1.2000,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,3.0000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,r1,18.3682,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,r1,2.1729,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,r1,0.6585,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,r1,2.4000,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,6.0000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,r1,36.7364,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,r1,1.4486,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,r1,0.4390,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,r1,1.6000,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,4.0000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,r1,24.4909,5,MUS$2010/kt,2035 electricity,all-week,night,all-year,r1,0.9333,0,MUS$2010/PJ,2040 heat,all-week,night,all-year,r1,2.3333,0,MUS$2010/PJ,2040 electricity,all-week,morning,all-year,r1,1.4000,1,MUS$2010/PJ,2040 diff --git a/tests/example_outputs/default_correlation/Results/MCACapacity.csv b/tests/example_outputs/default_correlation/Results/MCACapacity.csv index b45afdea8..d89a7846c 100644 --- a/tests/example_outputs/default_correlation/Results/MCACapacity.csv +++ b/tests/example_outputs/default_correlation/Results/MCACapacity.csv @@ -3,43 +3,55 @@ A1,10.0000,r1,2020,r1,residential,gasboiler,newcapa,2020 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2020 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2020 A1,5.0000,r1,2020,r1,residential,gasboiler,newcapa,2025 -A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2025 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2025 A1,1.0000,r1,2020,r1,power,gasCCGT,newcapa,2025 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2025 A1,15.0000,r1,2020,r1,gas,gassupply1,newcapa,2025 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2025 -A1,11.8632,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2025 +A1,4.2695,r1,2025,r1,residential,gasboiler,newcapa,2030 +A1,7.5938,r1,2025,r1,residential,heatpump,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2030 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2030 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2030 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2030 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2030 A1,7.5000,r1,2020,r1,gas,gassupply1,newcapa,2030 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2030 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2030 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2030 A1,5.6606,r1,2030,r1,residential,heatpump,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2035 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2035 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2035 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2035 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2035 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2035 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2035 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2035 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2035 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2035 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2035 A1,12.3569,r1,2035,r1,residential,heatpump,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2040 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2040 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2040 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2040 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2040 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2040 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2040 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2040 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2040 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2040 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2040 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2040 A1,6.1526,r1,2040,r1,residential,heatpump,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2045 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2045 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2045 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2045 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2045 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2045 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2045 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2045 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2045 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2045 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2045 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2045 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2045 A1,12.6739,r1,2045,r1,residential,heatpump,newcapa,2050 A1,6.4684,r1,2050,r1,residential,heatpump,newcapa,2050 -A1,5.6606,r1,2030,r1,power,windturbine,newcapa,2050 -A1,12.3569,r1,2035,r1,power,windturbine,newcapa,2050 +A1,2.3750,r1,2025,r1,power,gasCCGT,newcapa,2050 +A1,0.1408,r1,2030,r1,power,gasCCGT,newcapa,2050 +A1,7.5938,r1,2030,r1,power,windturbine,newcapa,2050 +A1,4.7631,r1,2035,r1,power,windturbine,newcapa,2050 A1,0.4919,r1,2040,r1,power,windturbine,newcapa,2050 A1,0.3170,r1,2045,r1,power,windturbine,newcapa,2050 A1,0.3159,r1,2050,r1,power,windturbine,newcapa,2050 -A1,6.7348,r1,2025,r1,gas,gassupply1,newcapa,2050 -A1,1.0556,r1,2030,r1,gas,gassupply1,newcapa,2050 +A1,2.5836,r1,2025,r1,gas,gassupply1,newcapa,2050 +A1,1.6179,r1,2035,r1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default_correlation/Results/MCAPrices.csv b/tests/example_outputs/default_correlation/Results/MCAPrices.csv index 92e23b63d..c07d14c17 100644 --- a/tests/example_outputs/default_correlation/Results/MCAPrices.csv +++ b/tests/example_outputs/default_correlation/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.2723,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.1939,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,27.2378,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.7610,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.3997,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.2723,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.8703,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.1939,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,27.2378,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.7610,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.3997,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,27.2037,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,20.6394,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.3314,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,27.2206,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,21.5177,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.2975,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,18.0082,r1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,12.2357,r1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,12.8003,r1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.1346,r1,0,MUS$2010/PJ,2030 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.1570,r1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.0082,r1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,12.2357,r1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.8003,r1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.1346,r1,1,MUS$2010/PJ,2030 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.1570,r1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,18.0082,r1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,12.2357,r1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,12.8003,r1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.1346,r1,2,MUS$2010/PJ,2030 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.1570,r1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.0082,r1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,12.2357,r1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.8003,r1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.1346,r1,3,MUS$2010/PJ,2030 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.1570,r1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,18.0082,r1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.7292,r1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,12.8003,r1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.7043,r1,4,MUS$2010/PJ,2030 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.1570,r1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,18.0082,r1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.0470,r1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.8003,r1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.9851,r1,5,MUS$2010/PJ,2030 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.1570,r1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,10.9783,r1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,10.7634,r1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,9.8019,r1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,6.9040,r1,0,MUS$2010/PJ,2035 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.2149,r1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.8542,r1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,12.8013,r1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.8019,r1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,7.7191,r1,1,MUS$2010/PJ,2035 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.2149,r1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,10.9783,r1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,10.7634,r1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,9.8019,r1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,6.9040,r1,2,MUS$2010/PJ,2035 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.2149,r1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.8542,r1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,12.8013,r1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.8019,r1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,7.7191,r1,3,MUS$2010/PJ,2035 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.2149,r1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,22.6485,r1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,23.5032,r1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,9.8019,r1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.9999,r1,4,MUS$2010/PJ,2035 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.2149,r1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,19.7716,r1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.5546,r1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,9.8019,r1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.8205,r1,5,MUS$2010/PJ,2035 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.2149,r1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.3487,r1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,10.6810,r1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,6.9900,r1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,6.8710,r1,0,MUS$2010/PJ,2040 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.2728,r1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.6966,r1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,12.7561,r1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.3403,r1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,7.7011,r1,1,MUS$2010/PJ,2040 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.2728,r1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.3487,r1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,10.6810,r1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,6.9900,r1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,6.8710,r1,2,MUS$2010/PJ,2040 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.2728,r1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.6966,r1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,12.7561,r1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.3403,r1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,7.7011,r1,3,MUS$2010/PJ,2040 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.2728,r1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,22.8408,r1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.6407,r1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,11.6580,r1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.8549,r1,4,MUS$2010/PJ,2040 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.2728,r1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,19.3519,r1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.1785,r1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.5073,r1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.6700,r1,5,MUS$2010/PJ,2040 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.2728,r1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.5488,r1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,10.6286,r1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,7.1381,r1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,6.8501,r1,0,MUS$2010/PJ,2045 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.3539,r1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,16.5870,r1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,12.7700,r1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.2773,r1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,7.7066,r1,1,MUS$2010/PJ,2045 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.3539,r1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.5488,r1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,10.6286,r1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,7.1381,r1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,6.8501,r1,2,MUS$2010/PJ,2045 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.3539,r1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,16.5870,r1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,12.7700,r1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.2773,r1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,7.7066,r1,3,MUS$2010/PJ,2045 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.3539,r1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,22.9936,r1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.8469,r1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,11.7350,r1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.7374,r1,4,MUS$2010/PJ,2045 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.3539,r1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,19.0885,r1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,15.3673,r1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,10.3394,r1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.7455,r1,5,MUS$2010/PJ,2045 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.3539,r1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.7219,r1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,10.5769,r1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,7.2182,r1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,6.8294,r1,0,MUS$2010/PJ,2050 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.4351,r1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,16.4728,r1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,12.7714,r1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.2334,r1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,7.7072,r1,1,MUS$2010/PJ,2050 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.4351,r1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.7219,r1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,10.5769,r1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,7.2182,r1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,6.8294,r1,2,MUS$2010/PJ,2050 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.4351,r1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,16.4728,r1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,12.7714,r1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.2334,r1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,7.7072,r1,3,MUS$2010/PJ,2050 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.4351,r1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,23.1647,r1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,30.1897,r1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,11.7961,r1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.6745,r1,4,MUS$2010/PJ,2050 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.4351,r1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,18.8316,r1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,15.2551,r1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.2340,r1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.7007,r1,5,MUS$2010/PJ,2050 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.4351,r1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_correlation/Results/MCASupply.csv b/tests/example_outputs/default_correlation/Results/MCASupply.csv index ea15193b0..81f3bcb3b 100644 --- a/tests/example_outputs/default_correlation/Results/MCASupply.csv +++ b/tests/example_outputs/default_correlation/Results/MCASupply.csv @@ -17,48 +17,54 @@ CO2f,all-week,late-peak,all-year,r1,107.8500,4,MUS$2010/kt,2020 gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 -gas,all-week,night,all-year,r1,1.0817,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,r1,0.1680,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,0.8751,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,0.9325,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,60.3400,0,MUS$2010/kt,2025 -gas,all-week,morning,all-year,r1,1.6301,1,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,r1,48.5650,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.3188,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,1.4053,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,90.9349,1,MUS$2010/kt,2025 -gas,all-week,afternoon,all-year,r1,1.0817,2,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,r1,73.1896,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,r1,0.1680,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,0.8751,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,0.9325,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,60.3400,2,MUS$2010/kt,2025 -gas,all-week,early-peak,all-year,r1,1.6301,3,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,r1,48.5650,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.3188,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,1.4053,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,90.9349,3,MUS$2010/kt,2025 -gas,all-week,late-peak,all-year,r1,3.2602,4,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,r1,73.1896,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,r1,2.6375,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,2.8105,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,r1,181.8698,4,MUS$2010/kt,2025 -gas,all-week,evening,all-year,r1,2.1786,5,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,r1,146.3791,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,r1,0.3383,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,1.7625,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,1.8781,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,121.5298,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,r1,0.1252,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,r1,0.7609,0,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,r1,97.8141,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,r1,0.2932,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,r1,0.2739,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,0.9690,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,r1,42.4490,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,r1,0.1887,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,r1,1.1468,1,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,r1,15.2770,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,r1,0.4418,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,r1,0.4127,1,MUS$2010/PJ,2030 heat,all-week,morning,all-year,r1,1.4603,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,r1,63.9724,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,r1,0.1252,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,r1,0.7609,2,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,r1,23.0231,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,r1,0.2932,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,r1,0.2739,2,MUS$2010/PJ,2030 heat,all-week,afternoon,all-year,r1,0.9690,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,r1,42.4490,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,r1,0.1887,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,r1,1.1468,3,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,r1,15.2770,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,r1,0.4418,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,r1,0.4127,3,MUS$2010/PJ,2030 heat,all-week,early-peak,all-year,r1,1.4603,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,r1,63.9724,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,r1,0.3774,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,r1,2.2936,4,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,r1,23.0231,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,r1,0.8836,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,r1,1.4556,4,MUS$2010/PJ,2030 heat,all-week,late-peak,all-year,r1,2.9206,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,r1,127.9448,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,r1,0.2522,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,r1,1.5326,5,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,r1,80.6403,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,r1,0.5905,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,r1,0.6922,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,r1,1.9516,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,r1,85.4958,5,MUS$2010/kt,2030 +CO2f,all-week,evening,all-year,r1,38.4888,5,MUS$2010/kt,2030 electricity,all-week,night,all-year,r1,0.3985,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,r1,0.9963,0,MUS$2010/PJ,2035 electricity,all-week,morning,all-year,r1,0.6006,1,MUS$2010/PJ,2035 @@ -68,7 +74,9 @@ heat,all-week,afternoon,all-year,r1,0.9963,2,MUS$2010/PJ,2035 electricity,all-week,early-peak,all-year,r1,0.6006,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,r1,1.5015,3,MUS$2010/PJ,2035 electricity,all-week,late-peak,all-year,r1,1.2012,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,r1,3.0029,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2035 electricity,all-week,evening,all-year,r1,0.8027,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,r1,2.0066,5,MUS$2010/PJ,2035 electricity,all-week,night,all-year,r1,0.4094,0,MUS$2010/PJ,2040 @@ -80,7 +88,9 @@ heat,all-week,afternoon,all-year,r1,1.0235,2,MUS$2010/PJ,2040 electricity,all-week,early-peak,all-year,r1,0.6170,3,MUS$2010/PJ,2040 heat,all-week,early-peak,all-year,r1,1.5425,3,MUS$2010/PJ,2040 electricity,all-week,late-peak,all-year,r1,1.2340,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2040 heat,all-week,late-peak,all-year,r1,3.0849,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2040 electricity,all-week,evening,all-year,r1,0.8246,5,MUS$2010/PJ,2040 heat,all-week,evening,all-year,r1,2.0614,5,MUS$2010/PJ,2040 electricity,all-week,night,all-year,r1,0.4164,0,MUS$2010/PJ,2045 @@ -92,7 +102,9 @@ heat,all-week,afternoon,all-year,r1,1.0410,2,MUS$2010/PJ,2045 electricity,all-week,early-peak,all-year,r1,0.6276,3,MUS$2010/PJ,2045 heat,all-week,early-peak,all-year,r1,1.5689,3,MUS$2010/PJ,2045 electricity,all-week,late-peak,all-year,r1,1.2551,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2045 heat,all-week,late-peak,all-year,r1,3.1378,4,MUS$2010/PJ,2045 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2045 electricity,all-week,evening,all-year,r1,0.8387,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,r1,2.0967,5,MUS$2010/PJ,2045 electricity,all-week,night,all-year,r1,0.4234,0,MUS$2010/PJ,2050 @@ -104,6 +116,8 @@ heat,all-week,afternoon,all-year,r1,1.0585,2,MUS$2010/PJ,2050 electricity,all-week,early-peak,all-year,r1,0.6381,3,MUS$2010/PJ,2050 heat,all-week,early-peak,all-year,r1,1.5952,3,MUS$2010/PJ,2050 electricity,all-week,late-peak,all-year,r1,1.2762,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,r1,0.6302,4,MUS$2010/PJ,2050 heat,all-week,late-peak,all-year,r1,3.1904,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,r1,34.5941,4,MUS$2010/kt,2050 electricity,all-week,evening,all-year,r1,0.8528,5,MUS$2010/PJ,2050 heat,all-week,evening,all-year,r1,2.1319,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index a9a92b5e1..218908a22 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -29,34 +29,34 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,17.6587,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,5.3588,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.3110,r1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.5944,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,15.7240,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,5.3588,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.6795,r1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.5944,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,17.6587,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,5.3588,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.3110,r1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.5944,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,15.7240,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,5.3588,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.6795,r1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.5944,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,13.7892,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,13.4913,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.0480,r1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.0103,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,14.7566,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,5.3588,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.3638,r1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.5944,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.1201,r1,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,5.1246,r1,0,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/Results/MCASupply.csv b/tests/example_outputs/default_timeslice/Results/MCASupply.csv index 666ecbbe4..89bb977aa 100644 --- a/tests/example_outputs/default_timeslice/Results/MCASupply.csv +++ b/tests/example_outputs/default_timeslice/Results/MCASupply.csv @@ -18,29 +18,29 @@ gas,all-week,evening,all-year,r1,1.9333,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,r1,1.6667,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,r1,107.8500,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,r1,0.1688,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,r1,1.3356,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,r1,1.0573,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,r1,1.3333,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,r1,74.2588,0,MUS$2010/kt,2025 +CO2f,all-week,night,all-year,r1,58.9805,0,MUS$2010/kt,2025 electricity,all-week,morning,all-year,r1,0.2531,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,r1,1.8643,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,r1,1.5859,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,r1,2.0000,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,r1,103.7490,1,MUS$2010/kt,2025 +CO2f,all-week,morning,all-year,r1,88.4707,1,MUS$2010/kt,2025 electricity,all-week,afternoon,all-year,r1,0.1688,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,r1,1.3356,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,r1,1.0573,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,r1,1.3333,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,r1,74.2588,2,MUS$2010/kt,2025 +CO2f,all-week,afternoon,all-year,r1,58.9805,2,MUS$2010/kt,2025 electricity,all-week,early-peak,all-year,r1,0.2531,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,r1,1.8643,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,r1,1.5859,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,r1,2.0000,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,r1,103.7490,3,MUS$2010/kt,2025 +CO2f,all-week,early-peak,all-year,r1,88.4707,3,MUS$2010/kt,2025 electricity,all-week,late-peak,all-year,r1,0.5062,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,r1,3.4502,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,r1,4.0000,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,r1,192.2197,4,MUS$2010/kt,2025 electricity,all-week,evening,all-year,r1,0.3375,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,r1,2.3929,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,r1,2.1146,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,r1,2.6667,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,r1,133.2393,5,MUS$2010/kt,2025 +CO2f,all-week,evening,all-year,r1,117.9609,5,MUS$2010/kt,2025 electricity,all-week,night,all-year,r1,0.4132,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,r1,0.7351,0,MUS$2010/PJ,2030 heat,all-week,night,all-year,r1,1.6667,0,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 7ebd1ad89..96c837634 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,22 +1,12 @@ asset,commodity,day,hour,installed,month,supply,technology,timeslice,year -0,electricity,all-week,night,2020,all-year,0.1667,gasCCGT,0,2025 -0,CO2f,all-week,night,2020,all-year,15.2783,gasCCGT,0,2025 -1,electricity,all-week,night,2025,all-year,0.0021,windturbine,0,2025 -0,electricity,all-week,morning,2020,all-year,0.1667,gasCCGT,1,2025 -0,CO2f,all-week,morning,2020,all-year,15.2783,gasCCGT,1,2025 -1,electricity,all-week,morning,2025,all-year,0.0865,windturbine,1,2025 -0,electricity,all-week,afternoon,2020,all-year,0.1667,gasCCGT,2,2025 -0,CO2f,all-week,afternoon,2020,all-year,15.2783,gasCCGT,2,2025 -1,electricity,all-week,afternoon,2025,all-year,0.0021,windturbine,2,2025 -0,electricity,all-week,early-peak,2020,all-year,0.1667,gasCCGT,3,2025 -0,CO2f,all-week,early-peak,2020,all-year,15.2783,gasCCGT,3,2025 -1,electricity,all-week,early-peak,2025,all-year,0.0865,windturbine,3,2025 +1,electricity,all-week,night,2025,all-year,0.1688,windturbine,0,2025 +1,electricity,all-week,morning,2025,all-year,0.2531,windturbine,1,2025 +1,electricity,all-week,afternoon,2025,all-year,0.1688,windturbine,2,2025 +1,electricity,all-week,early-peak,2025,all-year,0.2531,windturbine,3,2025 0,electricity,all-week,late-peak,2020,all-year,0.1667,gasCCGT,4,2025 0,CO2f,all-week,late-peak,2020,all-year,15.2783,gasCCGT,4,2025 1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2025 -0,electricity,all-week,evening,2020,all-year,0.1667,gasCCGT,5,2025 -0,CO2f,all-week,evening,2020,all-year,15.2783,gasCCGT,5,2025 -1,electricity,all-week,evening,2025,all-year,0.1708,windturbine,5,2025 +1,electricity,all-week,evening,2025,all-year,0.3375,windturbine,5,2025 1,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2030 2,electricity,all-week,night,2030,all-year,0.0736,windturbine,0,2030 1,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2030 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 7604e2d26..d0e488140 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -35,37 +35,37 @@ heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.1361,r1,0,MUS$2010/GWh,2025 +electricity,all-week,night,all-year,24.2058,r1,0,MUS$2010/GWh,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.8475,r1,0,MUS$2010/PJ,2025 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,29.1361,r1,1,MUS$2010/GWh,2025 +electricity,all-week,morning,all-year,26.1149,r1,1,MUS$2010/GWh,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,11.8475,r1,1,MUS$2010/PJ,2025 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.1361,r1,2,MUS$2010/GWh,2025 +electricity,all-week,afternoon,all-year,24.2058,r1,2,MUS$2010/GWh,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,11.8475,r1,2,MUS$2010/PJ,2025 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,29.1361,r1,3,MUS$2010/GWh,2025 +electricity,all-week,early-peak,all-year,26.1149,r1,3,MUS$2010/GWh,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,11.8475,r1,3,MUS$2010/PJ,2025 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,32.0920,r1,4,MUS$2010/GWh,2025 +electricity,all-week,late-peak,all-year,28.0240,r1,4,MUS$2010/GWh,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,11.8475,r1,4,MUS$2010/PJ,2025 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,29.1361,r1,5,MUS$2010/GWh,2025 +electricity,all-week,evening,all-year,27.0695,r1,5,MUS$2010/GWh,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,11.8475,r1,5,MUS$2010/PJ,2025 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 6586f2e60..657e63ac9 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -29,32 +29,32 @@ gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.1361,r1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,24.2058,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.1201,r1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,29.1361,r1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,26.1149,r1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2025 heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2025 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.1201,r1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.1361,r1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,24.2058,r1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2025 heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2025 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.1201,r1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,29.1361,r1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,26.1149,r1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2025 heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2025 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.1201,r1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,32.0920,r1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,28.0240,r1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2025 heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2025 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.1201,r1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,29.1361,r1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,27.0695,r1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2025 heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2025 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2025 From b83550af2d981366e854709cae71a30a6fa99dc9 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:31:43 +0100 Subject: [PATCH 26/41] Different selection method (testing) --- src/muse/dispatch.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index ec35dc367..af9ea0162 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -290,18 +290,10 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - maxprod_region = maxprod_y.sel( - asset=maxprod_y.asset[maxprod_y.region == region] - ) - techs_region = technologies.sel( - asset=technologies.asset[technologies.region == region] - ) - minprod_region = minprod_y.sel( - asset=minprod_y.asset[minprod_y.region == region] - ) - maxcons_region = maxcons_y.sel( - asset=maxcons_y.asset[maxcons_y.region == region] - ) + maxprod_region = maxprod_y.where(maxprod_y.region == region, drop=True) + techs_region = technologies.where(technologies.region == region, drop=True) + minprod_region = minprod_y.where(minprod_y.region == region, drop=True) + maxcons_region = maxcons_y.where(maxcons_y.region == region, drop=True) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. From e4395feed62f0052a8ea9faf368116320c7282aa Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:32:43 +0100 Subject: [PATCH 27/41] Revert "Different selection method (testing)" This reverts commit b83550af2d981366e854709cae71a30a6fa99dc9. --- src/muse/dispatch.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index af9ea0162..ec35dc367 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -290,10 +290,18 @@ def merit_order_production( maxcons_y = maxcons.sel(year=y) for region in demand.region.values: - maxprod_region = maxprod_y.where(maxprod_y.region == region, drop=True) - techs_region = technologies.where(technologies.region == region, drop=True) - minprod_region = minprod_y.where(minprod_y.region == region, drop=True) - maxcons_region = maxcons_y.where(maxcons_y.region == region, drop=True) + maxprod_region = maxprod_y.sel( + asset=maxprod_y.asset[maxprod_y.region == region] + ) + techs_region = technologies.sel( + asset=technologies.asset[technologies.region == region] + ) + minprod_region = minprod_y.sel( + asset=minprod_y.asset[minprod_y.region == region] + ) + maxcons_region = maxcons_y.sel( + asset=maxcons_y.asset[maxcons_y.region == region] + ) # Calculate timeslice-level costs for each asset in this year assuming full # dispatch. We use LCOE excluding capital costs. From 1d785084443cc0e814100e813dc47c763e4695ec Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:36:42 +0100 Subject: [PATCH 28/41] Simplify dispatch_by_merit_order --- src/muse/dispatch.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index ec35dc367..bb4cfc289 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -410,12 +410,7 @@ def dispatch_by_merit_order( # produce negative amounts or exceed this asset's headroom above minprod. addition_sorted = (remaining - cumsum_before).clip(min=0, max=available) - # Map dispatch additions back to the original asset order. - inverse_order = np.empty_like(order) - inverse_order[order] = np.arange(order.size) - addition = addition_sorted.isel(asset=inverse_order) - - # Final production is minimum production plus any additional production from these - # assets - result = minprod + addition - return result + # Map dispatch additions back to the original asset order before combining + # with minprod. + addition = addition_sorted.isel(asset=np.argsort(order)) + return minprod + addition From e9decf29255ee57c34acb60b1d268fa168de4e0b Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 16:41:12 +0100 Subject: [PATCH 29/41] Add tests --- tests/test_dispatch.py | 89 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 88 insertions(+), 1 deletion(-) diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index c4c9efb55..17f950367 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -1,6 +1,6 @@ import numpy as np import xarray as xr -from pytest import fixture +from pytest import fixture, raises from muse.commodities import is_enduse from muse.timeslices import broadcast_timeslice, distribute_timeslice @@ -224,3 +224,90 @@ def test_dispatch_by_merit_order(): coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, ) xr.testing.assert_equal(result, expected) + + +def test_dispatch_by_merit_order_with_unlabelled_assets(): + """Dispatch remains correct when the asset dimension has no labels.""" + from muse.dispatch import dispatch_by_merit_order + + demand = xr.DataArray( + [140], dims=("commodity",), coords={"commodity": ["electricity"]} + ) + minprod = xr.DataArray( + [[20], [10], [0]], + dims=("asset", "commodity"), + coords={"commodity": ["electricity"]}, + ) + maxprod = xr.DataArray( + [[50], [100], [30]], + dims=("asset", "commodity"), + coords={"commodity": ["electricity"]}, + ) + technology_costs = xr.DataArray([10, 5, 15], dims=("asset",)) + + result = dispatch_by_merit_order(demand, minprod, maxprod, technology_costs) + + expected = xr.DataArray( + [[40], [100], [0]], + dims=("asset", "commodity"), + coords={"commodity": ["electricity"]}, + ) + xr.testing.assert_equal(result, expected) + + +def test_dispatch_by_merit_order_rejects_reordered_costs(): + """Reordered labelled cost inputs are rejected by exact alignment.""" + from muse.dispatch import dispatch_by_merit_order + + demand = xr.DataArray( + [140], dims=("commodity",), coords={"commodity": ["electricity"]} + ) + minprod = xr.DataArray( + [[20], [10], [0]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + maxprod = xr.DataArray( + [[50], [100], [30]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + technology_costs = xr.DataArray( + [5, 10, 15], + dims=("asset",), + coords={"asset": ["B", "A", "C"]}, + ) + + with raises(ValueError, match="join='exact'"): + dispatch_by_merit_order(demand, minprod, maxprod, technology_costs) + + +def test_dispatch_by_merit_order_preserves_input_order_for_ties(): + """Stable sorting keeps the original asset order when costs are tied.""" + from muse.dispatch import dispatch_by_merit_order + + demand = xr.DataArray( + [45], dims=("commodity",), coords={"commodity": ["electricity"]} + ) + minprod = xr.DataArray( + [[0], [0], [0]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + maxprod = xr.DataArray( + [[30], [30], [30]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + technology_costs = xr.DataArray( + [10, 10, 20], dims=("asset",), coords={"asset": ["A", "B", "C"]} + ) + + result = dispatch_by_merit_order(demand, minprod, maxprod, technology_costs) + + expected = xr.DataArray( + [[30], [15], [0]], + dims=("asset", "commodity"), + coords={"asset": ["A", "B", "C"], "commodity": ["electricity"]}, + ) + xr.testing.assert_equal(result, expected) From ccbcd7215f849580bf2c1451588bc31d6bf32037 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 17:00:09 +0100 Subject: [PATCH 30/41] Ban implicit broadcasting over region dimension --- src/muse/__main__.py | 9 +++++++++ src/muse/timeslices.py | 4 ++++ src/muse/utilities.py | 20 ++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/src/muse/__main__.py b/src/muse/__main__.py index f5de4d1fa..e5e5bcc65 100644 --- a/src/muse/__main__.py +++ b/src/muse/__main__.py @@ -89,6 +89,15 @@ def patched_broadcast_compat_data(self, other): "`broadcast_timeslice` or `distribute_timeslice` (see `muse.timeslices`)." ) + if (isinstance(other, Variable)) and ("region" in self.dims) != ( + "region" in getattr(other, "dims", []) + ): + raise ValueError( + "Broadcasting along the 'region' dimension is required, but automatic " + "broadcasting is disabled. Please handle it explicitly using " + "`broadcast_region` (see `muse.utilities`)." + ) + # The rest of the function is copied directly from # xarray.core.variable._broadcast_compat_data if all(hasattr(other, attr) for attr in ["dims", "data", "shape", "encoding"]): diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index c7603f968..4017ce2b8 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -21,6 +21,8 @@ import pandas as pd from xarray import DataArray +from muse.utilities import broadcast_regions + TIMESLICE: DataArray = None # type: ignore @@ -156,6 +158,8 @@ def distribute_timeslice( broadcasted = broadcast_timeslice(data, ts=ts) timeslice_sum = ts.sum("timeslice").clip(1e-6) # prevents zero division timeslice_fractions = ts / broadcast_timeslice(timeslice_sum, ts=ts) + if "region" in data.dims: + timeslice_fractions = broadcast_regions(timeslice_fractions, data) return broadcasted * timeslice_fractions diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 66843382e..2545620d2 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -687,3 +687,23 @@ def camel_to_snake(name: str) -> str: result = result.replace("n2_o", "N2O") result = result.replace("f-gases", "F-gases") return result + + +def broadcast_regions(data: xr.DataArray, template: xr.DataArray) -> xr.DataArray: + """Convert a non-regional array to a regional array by broadcasting. + + If data is already regioned in the appropriate scheme, it will be returned + unchanged. + + Args: + data: Array to broadcast. + template: Dataarray with region coordinates to broadcast to. + + """ + # If data already has regions, check that it matches the template regions. + if "region" in data.dims: + if data.region.equals(template.region): + return data + raise ValueError("Data is already regioned, but does not match the reference.") + + return data.expand_dims(region=template.region, axis=template.dims.index("region")) From 1f2f4f0153f153dc4b2a4d90bd63415fbc6d22aa Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 17:23:05 +0100 Subject: [PATCH 31/41] Fix some tests --- src/muse/utilities.py | 2 +- tests/conftest.py | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 2545620d2..0c1728c05 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -706,4 +706,4 @@ def broadcast_regions(data: xr.DataArray, template: xr.DataArray) -> xr.DataArra return data raise ValueError("Data is already regioned, but does not match the reference.") - return data.expand_dims(region=template.region, axis=template.dims.index("region")) + return data.expand_dims(region=template.region) diff --git a/tests/conftest.py b/tests/conftest.py index 3d1f3b434..63061a2c8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,6 +13,7 @@ from muse.__main__ import patched_broadcast_compat_data from muse.agents import Agent +from muse.utilities import broadcast_regions @contextmanager @@ -241,7 +242,9 @@ def var(*dims, factor=100.0): return dims, (rand(*shape) * factor).astype(type(factor)) result["agent_share"] = var("technology", "region", "year") - result["agent_share"] /= sum(result.agent_share) + result["agent_share"] /= broadcast_regions( + sum(result.agent_share), result.agent_share + ) result["agent_share_zero"] = result["agent_share"] * 0 # first create a mask so each tech will have consistent inputs/outputs across years @@ -273,12 +276,20 @@ def var(*dims, factor=100.0): fout.loc[{"technology": tech, "commodity": i}] = 1 # expand along year and region, and fill with random numbers - ones = (result.year == result.year) * (result.region == result.region) - result["fixed_inputs"] = result.fixed_inputs * ones + ones = broadcast_regions(result.year == result.year, result.region) * ( + result.region == result.region + ) + result["fixed_inputs"] = ( + broadcast_regions(result.fixed_inputs, result.region) * ones + ) result.fixed_inputs[:] *= rand(*result.fixed_inputs.shape) - result["flexible_inputs"] = result.flexible_inputs * ones + result["flexible_inputs"] = ( + broadcast_regions(result.flexible_inputs, result.region) * ones + ) result.flexible_inputs[:] *= rand(*result.flexible_inputs.shape) - result["fixed_outputs"] = result.fixed_outputs * ones + result["fixed_outputs"] = ( + broadcast_regions(result.fixed_outputs, result.region) * ones + ) result.fixed_outputs[:] *= rand(*result.fixed_outputs.shape) result["total_capacity_limit"] = var("technology", "region", "year") From 31348ac1ffe48b83edf048dfb25d239f9877c053 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 17:27:43 +0100 Subject: [PATCH 32/41] Fix carbon budget --- src/muse/mca.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index badaeb3ca..183bedafc 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -15,7 +15,7 @@ from muse.readers import read_initial_market from muse.sectors import SECTORS_REGISTERED, AbstractSector, Sector from muse.timeslices import broadcast_timeslice, drop_timeslice -from muse.utilities import future_propagation +from muse.utilities import broadcast_regions, future_propagation class MCA: @@ -298,12 +298,14 @@ def run(self) -> None: getLogger(__name__).info( f"Updating carbon price for year {investment_year}" ) - new_price = self.update_carbon_price(new_market) + new_price: float = self.update_carbon_price(new_market) future_price = DataArray(new_price, coords=dict(year=investment_year)) new_market.prices.loc[dict(commodity=self.carbon_commodities)] = ( future_propagation( new_market.prices.sel(commodity=self.carbon_commodities), - broadcast_timeslice(future_price), + broadcast_timeslice( + broadcast_regions(future_price, new_market.region) + ), ) ) From 62cd3a49a958eda5f2542446c73e28117e035fd3 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 6 May 2026 18:03:33 +0100 Subject: [PATCH 33/41] Fix another test --- src/muse/demand_share.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/muse/demand_share.py b/src/muse/demand_share.py index 746ca3e76..81ae37405 100644 --- a/src/muse/demand_share.py +++ b/src/muse/demand_share.py @@ -503,6 +503,10 @@ def unmet_demand( assert "year" not in capacity.dims assert "year" not in demand.dims + # If there are no assets, no production is possible, so all demand is unmet. + if capacity.sizes["asset"] == 0: + return demand.copy() + # Calculate maximum production by existing assets produced = maximum_production( capacity=capacity, From e6810686e8e633cd10e4182f6d4e5bd8c39dfcd5 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 11:26:15 +0100 Subject: [PATCH 34/41] Ban implicit broadcasting over year dimension --- src/muse/__main__.py | 9 ++++ src/muse/agents/agent.py | 5 ++- src/muse/agents/factories.py | 5 ++- src/muse/costs.py | 6 ++- src/muse/dispatch.py | 84 ++++++++++++++++-------------------- src/muse/investments.py | 3 +- src/muse/sectors/sector.py | 83 ++++++++++++++++++++--------------- src/muse/timeslices.py | 4 +- src/muse/utilities.py | 20 +++++++++ 9 files changed, 129 insertions(+), 90 deletions(-) diff --git a/src/muse/__main__.py b/src/muse/__main__.py index e5e5bcc65..984ea0f3f 100644 --- a/src/muse/__main__.py +++ b/src/muse/__main__.py @@ -98,6 +98,15 @@ def patched_broadcast_compat_data(self, other): "`broadcast_region` (see `muse.utilities`)." ) + if (isinstance(other, Variable)) and ("year" in self.dims) != ( + "year" in getattr(other, "dims", []) + ): + raise ValueError( + "Broadcasting along the 'year' dimension is required, but automatic " + "broadcasting is disabled. Please handle it explicitly using " + "`broadcast_year` (see `muse.utilities`)." + ) + # The rest of the function is copied directly from # xarray.core.variable._broadcast_compat_data if all(hasattr(other, attr) for attr in ["dims", "data", "shape", "encoding"]): diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py index 09309c079..9b3ac775f 100644 --- a/src/muse/agents/agent.py +++ b/src/muse/agents/agent.py @@ -8,6 +8,7 @@ import xarray as xr from muse.timeslices import drop_timeslice +from muse.utilities import broadcast_years class AbstractAgent(ABC): @@ -494,7 +495,9 @@ def retirement_profile( investments = investments.reindex_like(profile, method="ffill") # Apply the retirement profile to the investments - new_assets = (investments * profile).rename(replacement="asset") + new_assets = (broadcast_years(investments, profile) * profile).rename( + replacement="asset" + ) new_assets["installed"] = "asset", [investment_year] * len(new_assets.asset) # The new assets have picked up quite a few coordinates along the way. diff --git a/src/muse/agents/factories.py b/src/muse/agents/factories.py index a906322e5..c87949ea8 100644 --- a/src/muse/agents/factories.py +++ b/src/muse/agents/factories.py @@ -10,6 +10,7 @@ from muse.agents.agent import Agent, InvestingAgent from muse.errors import AgentShareNotDefined, TechnologyNotDefined +from muse.utilities import broadcast_years def create_standard_agent( @@ -252,8 +253,8 @@ def _shared_capacity( techs = (existing > 0) & (shares > 0) techs = techs.any([u for u in techs.dims if u != "asset"]) if not any(techs): - return (capacity * shares).copy() - return (capacity * shares).sel(asset=techs.values).copy() + return (capacity * broadcast_years(shares, capacity)).copy() + return (capacity * broadcast_years(shares, capacity)).sel(asset=techs.values).copy() def _standardize_inputs( diff --git a/src/muse/costs.py b/src/muse/costs.py index d26ca8c82..75e500d3f 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -55,6 +55,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, get_level +from muse.utilities import broadcast_years def cost(func): @@ -625,10 +626,11 @@ def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): rates = discount_factor( years=years, interest_rate=technologies.interest_rate, - mask=years <= life, + mask=years <= broadcast_years(life, years), ) if "timeslice" in costs.dims: rates = broadcast_timeslice(rates, level=get_level(costs)) + costs = broadcast_years(costs, years) return (costs * rates).sum("year") @@ -648,7 +650,7 @@ def discount_factor( assert "year" not in interest_rate.dims # Calculate discount factor over the years - df = 1 / (1 + interest_rate) ** years + df = 1 / (1 + broadcast_years(interest_rate, years)) ** years # Apply mask if mask is not None: diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index bb4cfc289..2bf0fc7b3 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -49,6 +49,7 @@ def production( import xarray as xr from muse.registration import registrator +from muse.utilities import check_dimensions class PRODUCTION_SIGNATURE(Protocol): @@ -141,8 +142,9 @@ def share_based_production( from muse.quantities import emission, maximum_production, minimum_production from muse.utilities import broadcast_over_assets - assert "asset" not in demand.dims - assert "asset" in capacity.dims + check_dimensions(demand, ["timeslice", "commodity"], optional=["region"]) + check_dimensions(capacity, ["asset"]) + check_dimensions(technologies, ["asset", "commodity"]) # Maximum and minimum production for each asset maxprod = maximum_production( @@ -234,9 +236,10 @@ def merit_order_production( ) from muse.utilities import broadcast_over_assets - assert "asset" not in demand.dims - assert "asset" in capacity.dims - assert "asset" not in prices.dims + check_dimensions(demand, ["timeslice", "commodity"], optional=["region"]) + check_dimensions(capacity, ["asset"]) + check_dimensions(technologies, ["asset", "commodity"]) + check_dimensions(prices, ["timeslice", "commodity"], optional=["region"]) # Normalise demand/prices dataarrays to ensure they have a region dimension # Multi-region models will already have a region dimension @@ -283,51 +286,36 @@ def merit_order_production( # Initialise result with zeros result = xr.zeros_like(maxprod) - for y in maxprod.year.values: - prices_y = prices.sel(year=y) - maxprod_y = maxprod.sel(year=y) - minprod_y = minprod.sel(year=y) - maxcons_y = maxcons.sel(year=y) - - for region in demand.region.values: - maxprod_region = maxprod_y.sel( - asset=maxprod_y.asset[maxprod_y.region == region] - ) - techs_region = technologies.sel( - asset=technologies.asset[technologies.region == region] - ) - minprod_region = minprod_y.sel( - asset=minprod_y.asset[minprod_y.region == region] - ) - maxcons_region = maxcons_y.sel( - asset=maxcons_y.asset[maxcons_y.region == region] - ) + for region in demand.region.values: + # Select data for this region + maxprod_region = maxprod.sel(asset=maxprod.asset[maxprod.region == region]) + techs_region = technologies.sel( + asset=technologies.asset[technologies.region == region] + ) + minprod_region = minprod.sel(asset=minprod.asset[minprod.region == region]) + maxcons_region = maxcons.sel(asset=maxcons.asset[maxcons.region == region]) + + # Calculate timeslice-level costs for each asset assuming full + # dispatch. We use LCOE excluding capital costs. + technology_costs = marginal_cost( + techs_region, + prices.sel(region=region), + production=maxprod_region, + consumption=maxcons_region, + ) - # Calculate timeslice-level costs for each asset in this year assuming full - # dispatch. We use LCOE excluding capital costs. - technology_costs = marginal_cost( - techs_region, - prices_y.sel(region=region), - production=maxprod_region, - consumption=maxcons_region, + # Calculate production by dispatching assets in order of + # increasing cost until demand is met + for ts in maxprod.timeslice.values: + dispatch = dispatch_by_merit_order( + demand=demand.sel(timeslice=ts, region=region), + minprod=minprod_region.sel(timeslice=ts), + maxprod=maxprod_region.sel(timeslice=ts), + technology_costs=technology_costs.sel(timeslice=ts), ) - - # Calculate production for this year by dispatching assets in order of - # increasing cost until demand is met - for ts in maxprod_y.timeslice.values: - dispatch = dispatch_by_merit_order( - demand=demand.sel(year=y, timeslice=ts, region=region), - minprod=minprod_region.sel(timeslice=ts), - maxprod=maxprod_region.sel(timeslice=ts), - technology_costs=technology_costs.sel(timeslice=ts), - ) - result.loc[ - dict( - year=y, - timeslice=ts, - asset=result.asset[result.region == region], - ) - ] = dispatch + result.loc[ + dict(timeslice=ts, asset=result.asset[result.region == region]) + ] = dispatch # Add production of environmental pollutants env = is_pollutant(technologies.comm_usage) diff --git a/src/muse/investments.py b/src/muse/investments.py index 8a5149360..c5e5a361b 100644 --- a/src/muse/investments.py +++ b/src/muse/investments.py @@ -65,6 +65,7 @@ def investment( from muse.outputs.cache import cache_quantity from muse.registration import registrator from muse.timeslices import timeslice_max +from muse.utilities import broadcast_years INVESTMENT_SIGNATURE = Callable[ [xr.DataArray, xr.DataArray, xr.Dataset, list[Constraint], KwArg(Any)], @@ -203,7 +204,7 @@ def cliff_retirement_profile( dims="year", coords={"year": range(investment_year, max_year + 1)}, ) - profile = allyears < (investment_year + technical_life) # type: ignore + profile = allyears < broadcast_years(investment_year + technical_life, allyears) # type: ignore # Minimize the number of years needed to represent the profile fully # This is done by removing the central year of any three repeating years, ensuring diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index b429523d2..bf5b4b226 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -286,45 +286,58 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: technologies, capacity, installed_as_year=True ) - # Calculate supply - supply = self.supply_prod( - demand=market.consumption, - capacity=capacity, - technologies=technodata, - timeslice_level=self.timeslice_level, - prices=market.prices, - ) + # Calculate supply/consumption/costs (one year at a time) + supply_list = [] + consume_list = [] + costs_list = [] + for year in capacity.year.values: + supply_year = self.supply_prod( + demand=market.consumption.sel(year=year), + capacity=capacity.sel(year=year), + technologies=technodata, + timeslice_level=self.timeslice_level, + prices=market.prices.sel(year=year), + ) - # Select relevant prices for each asset - prices = broadcast_over_assets(market.prices, capacity, installed_as_year=False) + # Select relevant prices for each asset + prices_for_assets = broadcast_over_assets( + market.prices.sel(year=year), capacity, installed_as_year=False + ) - # Calculate consumption - consume = consumption( - technologies=technodata, - production=supply, - prices=prices, - timeslice_level=self.timeslice_level, - ) + # Calculate consumption + consume_year = consumption( + technologies=technodata, + production=supply_year, + prices=prices_for_assets, + timeslice_level=self.timeslice_level, + ) - # Calculate LCOE - # We select data for the second year, which corresponds to the investment year - # We base LCOE only on the portion of capacity that is actually used (#728) - utilized_capacity = capacity_to_service_demand( - demand=supply.isel(year=1), - technologies=technodata, - timeslice_level=self.timeslice_level, - ) - lcoe = levelized_cost_of_energy( - prices=prices.isel(year=1), - technologies=technodata, - capacity=utilized_capacity, - production=supply.isel(year=1), - consumption=consume.isel(year=1), - method="annual", - ) + # Calculate LCOE + # We base LCOE only on the portion of capacity that is actually used (#728) + utilized_capacity = capacity_to_service_demand( + demand=supply_year, + technologies=technodata, + timeslice_level=self.timeslice_level, + ) + lcoe = levelized_cost_of_energy( + prices=prices_for_assets, + technologies=technodata, + capacity=utilized_capacity, + production=supply_year, + consumption=consume_year, + method="annual", + ) + + # Calculate new commodity prices + costs_year = supply_cost(supply_year, lcoe, asset_dim="asset") + + supply_list.append(supply_year.expand_dims(year=[year])) + consume_list.append(consume_year.expand_dims(year=[year])) + costs_list.append(costs_year.expand_dims(year=[year])) - # Calculate new commodity prices - costs = supply_cost(supply, lcoe, asset_dim="asset") + supply = xr.concat(supply_list, dim="year") + consume = xr.concat(consume_list, dim="year") + costs = xr.concat(costs_list, dim="year") return supply, consume, costs diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py index 4017ce2b8..9215340ae 100644 --- a/src/muse/timeslices.py +++ b/src/muse/timeslices.py @@ -21,7 +21,7 @@ import pandas as pd from xarray import DataArray -from muse.utilities import broadcast_regions +from muse.utilities import broadcast_regions, broadcast_years TIMESLICE: DataArray = None # type: ignore @@ -160,6 +160,8 @@ def distribute_timeslice( timeslice_fractions = ts / broadcast_timeslice(timeslice_sum, ts=ts) if "region" in data.dims: timeslice_fractions = broadcast_regions(timeslice_fractions, data) + if "year" in data.dims: + timeslice_fractions = broadcast_years(timeslice_fractions, data) return broadcasted * timeslice_fractions diff --git a/src/muse/utilities.py b/src/muse/utilities.py index 0c1728c05..8465059ac 100644 --- a/src/muse/utilities.py +++ b/src/muse/utilities.py @@ -707,3 +707,23 @@ def broadcast_regions(data: xr.DataArray, template: xr.DataArray) -> xr.DataArra raise ValueError("Data is already regioned, but does not match the reference.") return data.expand_dims(region=template.region) + + +def broadcast_years(data: xr.DataArray, template: xr.DataArray) -> xr.DataArray: + """Convert a non-year array to a year array by broadcasting. + + If data is already yeared in the appropriate scheme, it will be returned + unchanged. + + Args: + data: Array to broadcast. + template: Dataarray with year coordinates to broadcast to. + + """ + # If data already has years, check that it matches the template years. + if "year" in data.dims: + if data.year.equals(template.year): + return data + raise ValueError("Data is already yeared, but does not match the reference.") + + return data.expand_dims(year=template.year) From 981c2ef9848e0414f7acba8c571524c6ec46dccc Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 13:38:37 +0100 Subject: [PATCH 35/41] Fix some test fixtures --- tests/conftest.py | 29 +++++++++++------------------ tests/test_dispatch.py | 11 +++++++---- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 63061a2c8..76d83bfc4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -13,7 +13,7 @@ from muse.__main__ import patched_broadcast_compat_data from muse.agents import Agent -from muse.utilities import broadcast_regions +from muse.utilities import broadcast_regions, broadcast_years @contextmanager @@ -225,7 +225,7 @@ def agent_args(coords) -> Mapping: @fixture def technologies(coords) -> Dataset: """Randomly generated technology characteristics.""" - from numpy import nonzero, sum + from numpy import nonzero from numpy.random import choice, rand, randint from muse.commodities import CommodityUsage @@ -242,9 +242,7 @@ def var(*dims, factor=100.0): return dims, (rand(*shape) * factor).astype(type(factor)) result["agent_share"] = var("technology", "region", "year") - result["agent_share"] /= broadcast_regions( - sum(result.agent_share), result.agent_share - ) + result["agent_share"] /= result.agent_share.sum("technology") result["agent_share_zero"] = result["agent_share"] * 0 # first create a mask so each tech will have consistent inputs/outputs across years @@ -276,21 +274,16 @@ def var(*dims, factor=100.0): fout.loc[{"technology": tech, "commodity": i}] = 1 # expand along year and region, and fill with random numbers - ones = broadcast_regions(result.year == result.year, result.region) * ( - result.region == result.region - ) - result["fixed_inputs"] = ( - broadcast_regions(result.fixed_inputs, result.region) * ones - ) - result.fixed_inputs[:] *= rand(*result.fixed_inputs.shape) - result["flexible_inputs"] = ( - broadcast_regions(result.flexible_inputs, result.region) * ones + fixed_in = broadcast_years( + broadcast_regions(result.fixed_inputs, result.region), result.year ) - result.flexible_inputs[:] *= rand(*result.flexible_inputs.shape) - result["fixed_outputs"] = ( - broadcast_regions(result.fixed_outputs, result.region) * ones + result["fixed_inputs"] = fixed_in * rand(*fixed_in.shape) + flex_in = broadcast_years( + broadcast_regions(result.flexible_inputs, result.region), result.year ) - result.fixed_outputs[:] *= rand(*result.fixed_outputs.shape) + result["flexible_inputs"] = flex_in * rand(*flex_in.shape) + fixed_out = broadcast_regions(result.fixed_outputs, result.region) + result["fixed_outputs"] = fixed_out * rand(*fixed_out.shape) result["total_capacity_limit"] = var("technology", "region", "year") result.total_capacity_limit.loc[{"year": 2030}] += result.total_capacity_limit.sel( diff --git a/tests/test_dispatch.py b/tests/test_dispatch.py index 17f950367..7cabcda70 100644 --- a/tests/test_dispatch.py +++ b/tests/test_dispatch.py @@ -7,6 +7,11 @@ from muse.utilities import broadcast_over_assets +@fixture +def capacity(capacity: xr.DataArray) -> xr.DataArray: + return capacity.isel(year=0) + + @fixture def technologies( technologies: xr.Dataset, capacity: xr.DataArray, timeslice @@ -29,7 +34,7 @@ def production( def prices( technologies: xr.Dataset, capacity: xr.DataArray, timeslice: xr.DataArray ) -> xr.DataArray: - # Make random prices for all commodities/timeslices/years/regions + # Make random prices for all commodities/timeslices/regions regions = xr.DataArray( capacity["region"].to_index().unique(), dims="region", @@ -39,16 +44,14 @@ def prices( np.random.rand( technologies.sizes["commodity"], timeslice.sizes["timeslice"], - capacity.sizes["year"], regions.size, ), coords={ "commodity": technologies.coords["commodity"], "timeslice": timeslice.coords["timeslice"], - "year": capacity.coords["year"], "region": regions, }, - dims=("commodity", "timeslice", "year", "region"), + dims=("commodity", "timeslice", "region"), ) return prices_by_region From 2f0a4f1bd745cab4a7887584a07a41ecd3da697e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 13:43:11 +0100 Subject: [PATCH 36/41] Fix dimension check --- src/muse/dispatch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index 2bf0fc7b3..e52d850cd 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -238,7 +238,7 @@ def merit_order_production( check_dimensions(demand, ["timeslice", "commodity"], optional=["region"]) check_dimensions(capacity, ["asset"]) - check_dimensions(technologies, ["asset", "commodity"]) + check_dimensions(technologies, ["asset", "commodity"], optional=["timeslice"]) check_dimensions(prices, ["timeslice", "commodity"], optional=["region"]) # Normalise demand/prices dataarrays to ensure they have a region dimension From 1152c57a6f06119315de41ef666bf61678eb9bbf Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 13:58:26 +0100 Subject: [PATCH 37/41] Fix more tests --- tests/test_constraints.py | 6 ++---- tests/test_demand_share.py | 7 ++++--- tests/test_quantities.py | 5 +++++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/tests/test_constraints.py b/tests/test_constraints.py index eb9ba28e7..73a9e6a55 100644 --- a/tests/test_constraints.py +++ b/tests/test_constraints.py @@ -61,10 +61,8 @@ def model_data(): # Create initial market demand as 80% of maximum production market_demand = 0.8 * maximum_production( broadcast_over_assets(technologies, assets), - assets.capacity, - ).sel(year=INVESTMENT_YEAR).groupby("technology").sum("asset").rename( - technology="asset" - ) + assets.capacity.sel(year=INVESTMENT_YEAR), + ).groupby("technology").sum("asset").rename(technology="asset") # Remove un-demanded commodities market_demand = market_demand.sel( diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py index 428446072..032fc4080 100644 --- a/tests/test_demand_share.py +++ b/tests/test_demand_share.py @@ -7,7 +7,7 @@ from muse.commodities import is_enduse from muse.quantities import maximum_production from muse.timeslices import drop_timeslice -from muse.utilities import broadcast_over_assets, interpolate_capacity +from muse.utilities import broadcast_over_assets, broadcast_years, interpolate_capacity CURRENT_YEAR = 2010 INVESTMENT_YEAR = 2030 @@ -131,8 +131,9 @@ def _matching_market(technologies, capacity): from muse.quantities import consumption as calc_consumption # Calculate production and consumption - production = maximum_production(technologies, capacity) - cons = calc_consumption(technologies, production) + techs = broadcast_years(technologies, capacity.year) + production = maximum_production(techs, capacity) + cons = calc_consumption(techs, production) # Handle regional grouping if needed if "region" in production.coords: diff --git a/tests/test_quantities.py b/tests/test_quantities.py index 4c57e4aee..e0bf55076 100644 --- a/tests/test_quantities.py +++ b/tests/test_quantities.py @@ -15,6 +15,11 @@ from muse.utilities import broadcast_over_assets +@fixture +def capacity(capacity: xr.DataArray) -> xr.DataArray: + return capacity.isel(year=0) + + @fixture def technologies( technologies: xr.Dataset, capacity: xr.DataArray, timeslice From 88df659c14d952808b5ffdf57abac61b90550316 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 14:21:46 +0100 Subject: [PATCH 38/41] Fix example models --- src/muse/dispatch.py | 11 +++++++++-- src/muse/readers/toml.py | 5 ++++- src/muse/regressions.py | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/muse/dispatch.py b/src/muse/dispatch.py index e52d850cd..e2bcbe821 100644 --- a/src/muse/dispatch.py +++ b/src/muse/dispatch.py @@ -143,8 +143,10 @@ def share_based_production( from muse.utilities import broadcast_over_assets check_dimensions(demand, ["timeslice", "commodity"], optional=["region"]) - check_dimensions(capacity, ["asset"]) - check_dimensions(technologies, ["asset", "commodity"]) + check_dimensions(capacity, ["asset"], optional=["dst_region"]) + check_dimensions( + technologies, ["asset", "commodity"], optional=["timeslice", "dst_region"] + ) # Maximum and minimum production for each asset maxprod = maximum_production( @@ -236,6 +238,11 @@ def merit_order_production( ) from muse.utilities import broadcast_over_assets + if "dst_region" in technologies.dims: + raise ValueError( + "Merit-order dispatch is not currently compatible with trade models." + ) + check_dimensions(demand, ["timeslice", "commodity"], optional=["region"]) check_dimensions(capacity, ["asset"]) check_dimensions(technologies, ["asset", "commodity"], optional=["timeslice"]) diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py index 5c49320d5..1058874f2 100644 --- a/src/muse/readers/toml.py +++ b/src/muse/readers/toml.py @@ -16,6 +16,7 @@ import xarray as xr from muse.defaults import DATA_DIRECTORY +from muse.utilities import broadcast_years DEFAULT_SETTINGS_PATH = DATA_DIRECTORY / "default_settings.toml" """Default settings path.""" @@ -721,7 +722,9 @@ def read_correlation_consumption(sector_conf: Any) -> xr.Dataset: # Split by timeslice if sector_conf.timeslice_shares_path is not None: shares = read_timeslice_shares(sector_conf.timeslice_shares_path) - consumption = broadcast_timeslice(consumption) * shares + consumption = broadcast_timeslice(consumption) * broadcast_years( + shares, consumption.year + ) else: consumption = distribute_timeslice(consumption) diff --git a/src/muse/regressions.py b/src/muse/regressions.py index 39560abe3..40c79053c 100644 --- a/src/muse/regressions.py +++ b/src/muse/regressions.py @@ -9,6 +9,8 @@ from xarray import DataArray, Dataset +from muse.utilities import broadcast_years + __all__ = [ "Exponential", "ExponentialAdj", @@ -444,6 +446,9 @@ def LogisticSigmoid( else: scale = 1 + scale = broadcast_years(scale, gdp.year) + constant = broadcast_years(constant, gdp.year) + c = broadcast_years(c, gdp.year) p = power(1 + power(gdp * scale / population, 2), 0.5) return 0.001 * (constant * population + gdp * c / p) From 4f176dfad6cb7225cabe54695796762e23467694 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 14:35:58 +0100 Subject: [PATCH 39/41] Fix remaining tests --- src/muse/examples.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/muse/examples.py b/src/muse/examples.py index 189a82c85..89b0a787a 100644 --- a/src/muse/examples.py +++ b/src/muse/examples.py @@ -39,6 +39,7 @@ from muse.mca import MCA from muse.sectors import AbstractSector from muse.timeslices import drop_timeslice +from muse.utilities import broadcast_years __all__ = ["model", "technodata"] @@ -271,6 +272,7 @@ def matching_market(sector: str, model: str = "default") -> xr.Dataset: market = xr.Dataset() techs = broadcast_over_assets(loaded_sector.technologies, assets.capacity) + techs = broadcast_years(techs, assets.capacity) production = maximum_production(techs, assets.capacity) market["supply"] = production.sum("asset") if "dst_region" in market.dims: From 97a733aa403735790f961f9fd45cfb2275f0e0d7 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 14:53:26 +0100 Subject: [PATCH 40/41] Fix final tests --- src/muse/regressions.py | 25 ++++++++++++++++--------- tests/test_regressions.py | 17 ++++++++++++----- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/muse/regressions.py b/src/muse/regressions.py index 40c79053c..b3cf9571b 100644 --- a/src/muse/regressions.py +++ b/src/muse/regressions.py @@ -358,8 +358,9 @@ def Exponential( ) -> DataArray: from numpy import exp - factor = 1e6 * self.coeffs.a * population - return factor * exp(self.coeffs.b * population / gdp) + coeffs = broadcast_years(self.coeffs, gdp.year) + factor = 1e6 * coeffs.a * population + return factor * exp(coeffs.b * population / gdp) @register_regression @@ -379,10 +380,11 @@ def ExponentialAdj( if year is None: year = self.base_year - factor = 1e6 * self.coeffs.a * population - unadjusted = factor * exp(self.coeffs.b * population / gdp) + coeffs = broadcast_years(self.coeffs, gdp.year) + factor = 1e6 * coeffs.a * population + unadjusted = factor * exp(coeffs.b * population / gdp) p = power(year + forecast - self.base_year, n) - return unadjusted * (1 + self.coeffs.w * p) / (1 + p) + return unadjusted * (1 + coeffs.w * p) / (1 + p) @register_regression @@ -396,7 +398,8 @@ def Logistic( """ from numpy import exp, power - a, b, c, w = self.coeffs.a, self.coeffs.b, self.coeffs.c, self.coeffs.w + coeffs = broadcast_years(self.coeffs, gdp.year) + a, b, c, w = coeffs.a, coeffs.b, coeffs.c, coeffs.w p = power(forecast, n) factor = 1e6 * a * population * (1 + w * p) / (1 + p) return factor / (1 + b * exp(gdp * c / population)) @@ -408,8 +411,9 @@ def Loglog(self, gdp: DataArray, population: DataArray, *args, **kwargs) -> Data """1e6 * e^a * population * (gpd/population)^b.""" from numpy import exp, power - factor = 1e6 * exp(self.coeffs.a) * population - return factor * power(gdp / population, self.coeffs.b) + coeffs = broadcast_years(self.coeffs, gdp.year) + factor = 1e6 * exp(coeffs.a) * population + return factor * power(gdp / population, coeffs.b) @register_regression @@ -503,7 +507,10 @@ def __call__( if year is not None and "year" in data.dims: data = data.interp(year=year, method=self.interpolation) - return coeffs.a * data.population + scale * ( + a = broadcast_years(coeffs.a, data.year) + scale = broadcast_years(scale, data.year) + gdpcap_offset = broadcast_years(gdpcap_offset, data.year) + return a * data.population + scale * ( data.gdp - gdpcap_offset * data.population ) diff --git a/tests/test_regressions.py b/tests/test_regressions.py index d62dfa005..5511e6f31 100644 --- a/tests/test_regressions.py +++ b/tests/test_regressions.py @@ -3,6 +3,7 @@ from pytest import approx, fixture from muse.regressions import Exponential, Linear +from muse.utilities import broadcast_years def create_dataset(coords, random_vars): @@ -47,8 +48,10 @@ def test_exponential(regression_params, drivers): # Calculate expected and actual results actual = functor(drivers) - factor = 1e6 * drivers.population * rp.a - expected = factor * exp(drivers.population / drivers.gdp * rp.b) + factor = 1e6 * drivers.population * broadcast_years(rp.a, drivers.year) + expected = factor * exp( + drivers.population / drivers.gdp * broadcast_years(rp.b, drivers.year) + ) expected, actual = broadcast(expected, actual) assert actual.values == approx(expected.values) @@ -68,8 +71,10 @@ def test_linear(regression_params, drivers): # Test basic functionality actual = functor(drivers, forecast=2) offset = drivers.gdp.sel(year=2010) / drivers.population.sel(year=2010) - expected = rp.a * drivers.population + rp.b0 * ( - drivers.gdp - offset * drivers.population + expected = broadcast_years( + rp.a, drivers.year + ) * drivers.population + broadcast_years(rp.b0, drivers.year) * ( + drivers.gdp - broadcast_years(offset, drivers.year) * drivers.population ) actual, expected = broadcast(actual, expected) assert actual.values == approx(expected.values) @@ -81,7 +86,9 @@ def test_linear(regression_params, drivers): ) population = drivers.population.interp(year=year, method="linear") gdp = drivers.gdp.interp(year=year, method="linear") - expected = rp.a * population + scale * (gdp - offset * population) + expected = broadcast_years(rp.a, population.year) * population + scale * ( + gdp - broadcast_years(offset, population.year) * population + ) actual = functor(drivers, forecast=2, year=year) actual, expected = broadcast(actual, expected) assert actual.values == approx(expected.values) From e083ac589814681cc368abb8ac6f9682b6668eb5 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 16:03:29 +0100 Subject: [PATCH 41/41] Copilot suggestions --- src/muse/regressions.py | 3 ++- tests/conftest.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/muse/regressions.py b/src/muse/regressions.py index b3cf9571b..ee531d569 100644 --- a/src/muse/regressions.py +++ b/src/muse/regressions.py @@ -430,6 +430,7 @@ def LogisticSigmoid( ) -> DataArray: """0.001 * (constant * pop + gdp * c / sqrt(1 + (gdp * scale / pop)^2).""" from numpy import power + from xarray import ones_like constant = self.coeffs.a c = self.coeffs.c @@ -448,7 +449,7 @@ def LogisticSigmoid( # fmt: enable scale = self.coeffs.b0.where(years < 2015, self.coeffs.b1) else: - scale = 1 + scale = ones_like(self.coeffs.b0) scale = broadcast_years(scale, gdp.year) constant = broadcast_years(constant, gdp.year) diff --git a/tests/conftest.py b/tests/conftest.py index 76d83bfc4..7207cfacc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -282,7 +282,9 @@ def var(*dims, factor=100.0): broadcast_regions(result.flexible_inputs, result.region), result.year ) result["flexible_inputs"] = flex_in * rand(*flex_in.shape) - fixed_out = broadcast_regions(result.fixed_outputs, result.region) + fixed_out = broadcast_years( + broadcast_regions(result.fixed_outputs, result.region), result.year + ) result["fixed_outputs"] = fixed_out * rand(*fixed_out.shape) result["total_capacity_limit"] = var("technology", "region", "year")