From 33a69f4f247c94229c80256fd13c161d041f3d12 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 10:45:10 +0000 Subject: [PATCH 01/22] Fix outputs - save data for investment year --- src/muse/mca.py | 5 +++-- src/muse/outputs/sector.py | 5 +---- src/muse/sectors/sector.py | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index 995b5f65b..9a5404fd6 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -325,8 +325,9 @@ def run(self) -> None: ) # Global outputs - self.outputs(self.market, self.sectors, year=self.time_framework[year_idx]) # type: ignore - self.outputs_cache.consolidate_cache(year=self.time_framework[year_idx]) + investment_year = years[1] + self.outputs(self.market, self.sectors, year=investment_year) + self.outputs_cache.consolidate_cache(year=investment_year) getLogger(__name__).info( f"Finished simulation period {years[0]} to {years[1]} " diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 9ecb82fde..66a1700f9 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -102,10 +102,7 @@ def _factory( quantities = [_quantity_factory(param, registry) for param in params] sinks = [sink_factory(param, sector_name=sector_name) for param in params] - def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]: - if year is None: - year = int(market.year.min()) - + def save_multiple_outputs(market, *args, year: int) -> list[Any]: return [ sink(quantity(market, *args), year=year) for quantity, sink in zip(quantities, sinks) diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index c9b48c510..01e4b7187 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -283,7 +283,8 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: def save_outputs(self) -> None: """Calls the outputs function with the current output data.""" - self.outputs(self.output_data, self.capacity) + investment_year = self.output_data.year.values[1] + self.outputs(self.output_data, self.capacity, year=investment_year) def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: """Computes resulting market: production, consumption, and costs.""" From 1664e586dc08169d9df449bf7697f5f3341dd56d Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 10:52:48 +0000 Subject: [PATCH 02/22] Revert change to fix tests --- src/muse/outputs/sector.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 66a1700f9..9ecb82fde 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -102,7 +102,10 @@ def _factory( quantities = [_quantity_factory(param, registry) for param in params] sinks = [sink_factory(param, sector_name=sector_name) for param in params] - def save_multiple_outputs(market, *args, year: int) -> list[Any]: + def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]: + if year is None: + year = int(market.year.min()) + return [ sink(quantity(market, *args), year=year) for quantity, sink in zip(quantities, sinks) From 3473565f8b0b2d93ca2d449bc1a7f4e95eb9dbec Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 10:59:37 +0000 Subject: [PATCH 03/22] Update results files --- .../Results/MCACapacity.csv | 33 +++++-- .../1-single-objective/Results/MCAPrices.csv | 48 +++++----- .../Results/MCACapacity.csv | 31 ++++-- .../Results/MCAPrices.csv | 48 +++++----- .../1-correlation/Results/MCACapacity.csv | 13 ++- .../1-correlation/Results/MCAPrices.csv | 48 +++++----- .../1-introduction/Results/MCACapacity.csv | 10 +- .../1-introduction/Results/MCAPrices.csv | 48 +++++----- .../2-scenario/Results/MCACapacity.csv | 13 ++- .../2-scenario/Results/MCAPrices.csv | 48 +++++----- .../1-new-region/Results/MCACapacity.csv | 30 ++++-- .../1-new-region/Results/MCAPrices.csv | 96 +++++++++---------- .../Results/MCACapacity.csv | 16 +++- .../1-exogenous-demand/Results/MCAPrices.csv | 60 ++++++------ .../1-carbon-budget/Results/MCACapacity.csv | 10 +- .../1-carbon-budget/Results/MCAPrices.csv | 48 +++++----- .../1-carbon-budget/Results/MCASupply.csv | 42 ++++---- .../1-min-constraint/Results/MCACapacity.csv | 10 +- .../1-min-constraint/Results/MCAPrices.csv | 48 +++++----- .../1-min-constraint/Results/Power_Supply.csv | 66 ++++++++----- .../2-max-constraint/Results/MCACapacity.csv | 10 +- .../2-max-constraint/Results/MCAPrices.csv | 48 +++++----- .../2-max-constraint/Results/Power_Supply.csv | 62 ++++++++---- .../Results/MCACapacity.csv | 15 ++- .../1-modify-timeslices/Results/MCAPrices.csv | 64 ++++++------- .../Results/MCACapacity.csv | 26 ++++- .../Results/MCAPrices.csv | 64 ++++++------- .../Results/MCACapacity.csv | 14 ++- .../new-decision-metric/Results/MCAPrices.csv | 48 +++++----- .../default/Results/MCACapacity.csv | 14 ++- .../default/Results/MCAPrices.csv | 48 +++++----- .../default_adhoc/Results/MCACapacity.csv | 10 +- .../default_adhoc/Results/MCAPrices.csv | 48 +++++----- .../default_retro/Results/MCACapacity.csv | 42 +++++--- .../default_retro/Results/MCAPrices.csv | 48 +++++----- .../default_timeslice/Results/MCACapacity.csv | 10 +- .../default_timeslice/Results/MCAPrices.csv | 48 +++++----- .../Results/Power_Supply.csv | 54 ++++++++--- .../medium/Results/MCACapacity.csv | 19 +++- .../medium/Results/MCAPrices.csv | 60 ++++++------ .../minimum_service/Results/MCACapacity.csv | 6 +- .../minimum_service/Results/MCAPrices.csv | 24 ++--- .../minimum_service/Results/MCASupply.csv | 12 +-- .../multiple_agents/Results/MCACapacity.csv | 17 +++- .../multiple_agents/Results/MCAPrices.csv | 48 +++++----- .../trade/Results/MCACapacity.csv | 21 ++-- .../trade/Results/MCAPrices.csv | 62 +++++++----- 47 files changed, 993 insertions(+), 715 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 ea0c8ef96..60d99538d 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 @@ -1,10 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 @@ -91,3 +85,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 7964d0a1e..e6c8eaafc 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index ea0c8ef96..0b57e81ba 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 @@ -1,10 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 @@ -91,3 +85,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 7964d0a1e..5771c156f 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 0f784f8f5..5947be655 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 @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -38,3 +35,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,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 618937468..e669d1f9c 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.19960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.02330000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 593bcae69..b184a9a14 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 @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -30,3 +27,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,solarPV,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 8be0b1287..7e4ef3ab2 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,15.50320000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,9.78050000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 9397c720e..1bbe53689 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 @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -43,3 +40,13 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 96680e9a7..e0d3454dc 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.24100000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.60410000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.60410000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.60410000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.60410000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.60410000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.60410000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 255cc0ec0..6cdbd733b 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 @@ -1,10 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 @@ -99,3 +93,27 @@ A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045 A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 +A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 +A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 +A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050 +A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,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 14c564667..4bbcc9f7d 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 @@ -1,52 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 electricity,all-week,night,all-year,19.97590000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 @@ -287,3 +239,51 @@ heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index c8b104bfe..49cf85daa 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 @@ -1,8 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 @@ -54,3 +50,15 @@ A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index f4b0bf1b4..cd340e848 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 @@ -1,34 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,18.98780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.53590000000,R1,0,MUS$2010/PJ,2025 @@ -179,3 +149,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index 357e67807..3d9fce8f8 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 @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -13,3 +10,10 @@ A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index a7505cb8c..dd1d01f86 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.58490000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.15980000000,R1,0,MUS$2010/PJ,2025 @@ -71,3 +47,27 @@ electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index 27166a56d..7dea0bcaf 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 @@ -1,22 +1,4 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year -gas,all-week,night,all-year,R1,1.16000000000,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,R1,1.00000000000,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,R1,64.71000000000,0,MUS$2010/kt,2020 -gas,all-week,morning,all-year,R1,1.74000000000,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,R1,1.50000000000,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,R1,97.06500000000,1,MUS$2010/kt,2020 -gas,all-week,afternoon,all-year,R1,1.16000000000,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,R1,1.00000000000,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,R1,64.71000000000,2,MUS$2010/kt,2020 -gas,all-week,early-peak,all-year,R1,1.74000000000,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,R1,1.50000000000,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,R1,97.06500000000,3,MUS$2010/kt,2020 -gas,all-week,late-peak,all-year,R1,1.93330000000,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,R1,1.66670000000,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,R1,107.85000000000,4,MUS$2010/kt,2020 -gas,all-week,evening,all-year,R1,1.93330000000,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,R1,1.66670000000,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,R1,107.85000000000,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,R1,0.42220000000,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,R1,0.40570000000,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,R1,1.33330000000,0,MUS$2010/PJ,2025 @@ -65,3 +47,27 @@ electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index 4cc29c1f0..e3140c1fe 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -30,3 +27,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 9c7ec3faa..1521a4c86 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,8.75610000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.68250000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 18ed2f4cb..d2eae66c7 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,16 +1,4 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 @@ -29,18 +17,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -113,3 +101,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 48b275d9e..142fab7f9 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -30,3 +27,10 @@ A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 336d4aa92..e3a5d844d 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 @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,9.07710000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.76030000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 1e62a502c..07ea1c621 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,12 +1,4 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 -0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025 @@ -25,18 +17,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -109,3 +101,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 25cfe1164..a4def5fe6 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 @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -51,3 +48,15 @@ A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 2aa26615c..4b1a545dd 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 @@ -1,36 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.96230000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.77760000000,R1,0,MUS$2010/PJ,2025 @@ -191,3 +159,35 @@ electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.84580000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.84580000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.84580000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.84580000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.84580000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050 +CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 +electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 +CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index a6805883c..fdb0f6460 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2022 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 @@ -138,3 +135,26 @@ A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 7b7db94e1..bb2d0dc7e 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 @@ -1,36 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 -CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 -electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 -CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,17.85770000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 heat,all-week,night,all-year,9.94600000000,R1,0,MUS$2010/PJ,2022 @@ -319,3 +287,35 @@ electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,12.70910000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 +electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.97240000000,R1,0,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.97240000000,R1,1,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 +electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.97240000000,R1,2,MUS$2010/PJ,2040 +CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.97240000000,R1,3,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.97240000000,R1,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.97240000000,R1,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 +electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.97240000000,R1,6,MUS$2010/PJ,2040 +CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 +electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.97240000000,R1,7,MUS$2010/PJ,2040 +CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 63229b23f..b205d4edc 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -47,3 +44,14 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index ea92faa3c..f0a939173 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,17.00150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,9.90690000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.46670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.68810000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.68810000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 8c271eae7..be00adca3 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -47,3 +44,14 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 5b0ca6dc2..4f2bbd3bd 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 3dae1b300..3a0814abe 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -30,3 +27,10 @@ A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 7336a95aa..381fbb6d7 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.26000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.65340000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index 2260d06b5..70d333ac5 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -1,40 +1,54 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 +A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,13.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 -A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2025 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,newcapa,2025 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2025 +A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030 A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,5.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2030 -A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2030 +A1,2.25000000000,R1,2030,R1,power,windturbine,retrofit,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,retrofit,2030 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,19.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2035 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2035 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2035 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2035 +A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040 A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 -A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040 +A1,11.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2040 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2040 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2040 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2040 +A1,6.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045 A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045 +A1,25.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2045 A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2045 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 +A1,6.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 +A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 9c7507365..ba64b4a2b 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.91890000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,13.09670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.65350000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.65350000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.65350000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.65350000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.65350000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.65350000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index 4cc29c1f0..e3140c1fe 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -1,7 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 @@ -30,3 +27,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index cd458e05d..9457c87ef 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,8.84520000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.71080000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 38fcef76c..eb692f925 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -17,18 +17,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.11110000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,10.18560000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -101,3 +101,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index ca4c99ade..a0f67debf 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -1,8 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,8.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2025 @@ -56,3 +52,18 @@ A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 +A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index e35561fc7..5766b9798 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -1,34 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.45710000000,R1,0,MUS$2010/PJ,2025 @@ -179,3 +149,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.60310000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.60310000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.60310000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.60310000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,10.60310000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.60310000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 638edd772..9a1fe1c4b 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -1,6 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,26.00000000000,R1,2010,R1,industry,procammonia_1,newcapa,2010 -A1,26.00000000000,R1,2010,R1,industry,procammonia_2,newcapa,2010 A1,21.66670000000,R1,2010,R1,industry,procammonia_1,newcapa,2015 A1,8.47450000000,R1,2015,R1,industry,procammonia_1,newcapa,2015 A1,21.66670000000,R1,2010,R1,industry,procammonia_2,newcapa,2015 @@ -37,3 +35,7 @@ A1,8.70630000000,R1,2030,R1,industry,procammonia_1,newcapa,2045 A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2045 A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2045 A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2045 +A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2050 +A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2050,R1,industry,procammonia_1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 65a63033f..2db12b399 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -1,16 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -fuel3,all-week,all-day,winter,0.05330000000,R1,0,MUS$2010/PJ,2010 -fuel1,all-week,all-day,winter,1.00000000000,R1,0,MUS$2010/PJ,2010 -fuel2,all-week,all-day,winter,9.55120000000,R1,0,MUS$2010/PJ,2010 -ammonia,all-week,all-day,winter,321.15000000000,R1,0,MUS$2010/Mt,2010 -fuel3,all-week,all-day,summer,0.05330000000,R1,1,MUS$2010/PJ,2010 -fuel1,all-week,all-day,summer,1.00000000000,R1,1,MUS$2010/PJ,2010 -fuel2,all-week,all-day,summer,9.55120000000,R1,1,MUS$2010/PJ,2010 -ammonia,all-week,all-day,summer,321.15000000000,R1,1,MUS$2010/Mt,2010 -fuel3,all-week,all-day,spring-autumn,0.05330000000,R1,2,MUS$2010/PJ,2010 -fuel1,all-week,all-day,spring-autumn,1.00000000000,R1,2,MUS$2010/PJ,2010 -fuel2,all-week,all-day,spring-autumn,9.55120000000,R1,2,MUS$2010/PJ,2010 -ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 @@ -95,3 +83,15 @@ fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 +fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 +fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 +fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 +ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 +fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 +fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 +fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 +ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 +fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 +fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 +fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 +ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index fc0955d32..ad5f7b9a5 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -1,10 +1,4 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year -ammonia,all-week,all-day,winter,R1,14.73330000000,0,MUS$2010/Mt,2010 -CO2f,all-week,all-day,winter,R1,53628.56500000000,0,MUS$2010/kt,2010 -ammonia,all-week,all-day,summer,R1,14.73330000000,1,MUS$2010/Mt,2010 -CO2f,all-week,all-day,summer,R1,53628.56500000000,1,MUS$2010/kt,2010 -ammonia,all-week,all-day,spring-autumn,R1,14.73330000000,2,MUS$2010/Mt,2010 -CO2f,all-week,all-day,spring-autumn,R1,53628.56500000000,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2015 CO2f,all-week,all-day,winter,R1,55092.44800000000,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2015 @@ -47,3 +41,9 @@ ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,R1,58000.48940000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,R1,56294.59260000000,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,R1,13.74870000000,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,R1,54623.16370000000,0,MUS$2010/kt,2050 +ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 +CO2f,all-week,all-day,summer,R1,56035.99150000000,1,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,R1,13.74870000000,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,R1,54623.16370000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index e5426235c..d090e767d 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -1,8 +1,4 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 @@ -58,3 +54,16 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 5b0ca6dc2..4f2bbd3bd 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 -CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 -CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 -CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 -CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 -CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 @@ -143,3 +119,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index eba56c678..5e0c57c73 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -1,19 +1,24 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year -A1,662.76000000000,R1,2010,R1,residential,gasboiler,retrofit,2020 -A1,35.00000000000,R2,2010,R2,residential,gasboiler,retrofit,2020 -A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020 -A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020 -A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020 -A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020 +A1,74.53330000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025 -A1,256.52070000000,R1,2025,R1,residential,heatpump,retrofit,2025 +A1,181.98730000000,R1,2025,R1,residential,heatpump,retrofit,2025 A1,192.00000000000,R1,2010,R1,power,gasCCGT,agent,2025 A1,140.00000000000,R2,2010,R2,power,gasCCGT,agent,2025 +A1,74.53330000000,R1,2030,R1,residential,heatpump,newcapa,2030 A1,463.93200000000,R1,2010,R1,residential,gasboiler,retrofit,2030 A1,256.52070000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2030 +A1,99.41400000000,R1,2030,R1,residential,heatpump,retrofit,2030 A1,24.50000000000,R2,2010,R2,residential,gasboiler,retrofit,2030 A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 +A1,18.63330000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 +A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2035 +A1,326.11050000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,0.38330000000,R2,2035,R2,residential,heatpump,newcapa,2035 +A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 +A1,18.40000000000,R2,2035,R2,residential,heatpump,retrofit,2035 +A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 +A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index e248bd000..200371bd2 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,28 +1,4 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,13.98150000000,R1,0,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.13890000000,R2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.71680000000,R1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.71680000000,R2,0,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,13.98150000000,R1,1,MUS$2010/PJ,2020 -electricity,all-week,morning,all-year,19.13890000000,R2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.71680000000,R1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.71680000000,R2,1,MUS$2010/PJ,2020 -electricity,all-week,afternoon,all-year,13.98150000000,R1,2,MUS$2010/PJ,2020 -electricity,all-week,afternoon,all-year,19.13890000000,R2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.71680000000,R1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.71680000000,R2,2,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,13.98150000000,R1,3,MUS$2010/PJ,2020 -electricity,all-week,early-peak,all-year,19.13890000000,R2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.71680000000,R1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.71680000000,R2,3,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,13.98150000000,R1,4,MUS$2010/PJ,2020 -electricity,all-week,late-peak,all-year,19.13890000000,R2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.71680000000,R1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.71680000000,R2,4,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,29.38390000000,R1,0,MUS$2010/PJ,2025 electricity,all-week,night,all-year,25.66110000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,14.62380000000,R1,0,MUS$2010/PJ,2025 @@ -88,4 +64,40 @@ electricity,all-week,evening,all-year,31.00090000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,52.15770000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035 From 24ec77450dc6ca66b3aba2be249b13c077c6a3db Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 11:06:22 +0000 Subject: [PATCH 04/22] Restore test --- tests/test_outputs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_outputs.py b/tests/test_outputs.py index e776f2d66..9a8105786 100644 --- a/tests/test_outputs.py +++ b/tests/test_outputs.py @@ -556,7 +556,7 @@ def test_consolidate_quantity(newcapa_agent, retro_agent): (*agents[retro_agent.uuid].keys(), "installed", "year", "technology", quantity) ) assert set(actual.columns) == cols - assert all(actual.year == newcapa_agent.forecast_year) + assert all(actual.year == newcapa_agent.year) assert all(actual.installed == newcapa_agent.year) assert all( name in (newcapa_agent.name, retro_agent.name) for name in actual.agent.unique() From 872b04b510d96f741a4cc1e1cee949ce27084b16 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 13:45:02 +0000 Subject: [PATCH 05/22] Revert change to outputs cache --- src/muse/mca.py | 3 ++- src/muse/outputs/sector.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index 9a5404fd6..e971d8631 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -327,7 +327,8 @@ def run(self) -> None: # Global outputs investment_year = years[1] self.outputs(self.market, self.sectors, year=investment_year) - self.outputs_cache.consolidate_cache(year=investment_year) + self.outputs_cache.consolidate_cache(year=years[0]) + # TODO: change cache to investment_year (not working properly anyway) getLogger(__name__).info( f"Finished simulation period {years[0]} to {years[1]} " diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 9ecb82fde..5eb95b93b 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -104,7 +104,7 @@ def _factory( def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]: if year is None: - year = int(market.year.min()) + year = int(market.year.max()) return [ sink(quantity(market, *args), year=year) From 1b5072b065262b71b60e28f0ef1af14ed1dee230 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 5 Feb 2025 17:08:01 +0000 Subject: [PATCH 06/22] Get outputs for first year --- src/muse/mca.py | 8 +++++- src/muse/outputs/mca.py | 55 +++++++++++++++++++++++--------------- src/muse/outputs/sector.py | 5 +++- src/muse/sectors/sector.py | 5 ++-- 4 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index e971d8631..0683c99be 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -306,7 +306,9 @@ def run(self) -> None: # Save sector outputs for sector in self.sectors: if type(sector) is Sector: - sector.save_outputs() + if year_idx == 0: + sector.save_outputs(years[0]) + sector.save_outputs(years[1]) # If we need to account for the carbon budget, we might need to change # the budget for the future, too. @@ -324,6 +326,10 @@ def run(self) -> None: self.market.prices.sel(dims), new_market.prices.sel(year=years[1]) ) + if year_idx == 0: + # Necessary to get global outputs for the first year of the framework + self.outputs(self.market, self.sectors, year=years[0]) + # Global outputs investment_year = years[1] self.outputs(self.market, self.sectors, year=investment_year) diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 966c1c170..5aaf6cd14 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -8,7 +8,9 @@ @register_output_quantity def quantity( sectors: List[AbstractSector], - market: xr.Dataset, **kwargs + market: xr.Dataset, + year: int, + **kwargs ) -> Union[pd.DataFrame, xr.DataArray]: pass @@ -76,9 +78,13 @@ def round_values(function: Callable) -> OUTPUT_QUANTITY_SIGNATURE: @wraps(function) def rounded( - market: xr.Dataset, sectors: list[AbstractSector], rounding: int = 4, **kwargs + market: xr.Dataset, + sectors: list[AbstractSector], + year: int, + rounding: int = 4, + **kwargs, ) -> xr.DataArray: - result = function(market, sectors, **kwargs) + result = function(market=market, sectors=sectors, year=year, **kwargs) if hasattr(result, "to_dataframe"): result = result.to_dataframe() @@ -150,7 +156,7 @@ def reformat_finite_resources(params): @register_output_quantity @round_values def consumption( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current consumption.""" return market_quantity(market.consumption, **kwargs).to_dataframe().reset_index() @@ -158,7 +164,9 @@ def consumption( @register_output_quantity @round_values -def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> pd.DataFrame: +def supply( + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs +) -> pd.DataFrame: """Current supply.""" return market_quantity(market.supply, **kwargs).to_dataframe().reset_index() @@ -168,6 +176,7 @@ def supply(market: xr.Dataset, sectors: list[AbstractSector], **kwargs) -> pd.Da def prices( market: xr.Dataset, sectors: list[AbstractSector], + year: int, **kwargs, ) -> pd.DataFrame: """Current MCA market prices.""" @@ -177,7 +186,7 @@ def prices( @register_output_quantity @round_values def capacity( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current capacity across all sectors.""" return _aggregate_sectors(sectors, op=sector_capacity) @@ -236,14 +245,14 @@ def _aggregate_sectors( @register_output_quantity(name=["fuel_costs"]) def metric_fuel_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current fuel costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_fuel_costs) + return _aggregate_sectors(sectors, market, year, op=sector_fuel_costs) def sector_fuel_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector fuel costs with agent annotations.""" from muse.commodities import is_fuel @@ -299,14 +308,14 @@ def sector_fuel_costs( @register_output_quantity(name=["capital_costs"]) def metric_capital_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current capital costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_capital_costs) + return _aggregate_sectors(sectors, market, year, op=sector_capital_costs) def sector_capital_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector capital costs with agent annotations.""" data_sector: list[xr.DataArray] = [] @@ -342,14 +351,14 @@ def sector_capital_costs( @register_output_quantity(name=["emission_costs"]) def metric_emission_costs( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current emission costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_emission_costs) + return _aggregate_sectors(sectors, market, year, op=sector_emission_costs) def sector_emission_costs( - sector: AbstractSector, market: xr.Dataset, **kwargs + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs ) -> pd.DataFrame: """Sector emission costs with agent annotations.""" from muse.commodities import is_enduse, is_pollutant @@ -407,13 +416,15 @@ def sector_emission_costs( @register_output_quantity(name=["LCOE"]) def metric_lcoe( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current lifetime levelised cost across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_lcoe) + return _aggregate_sectors(sectors, market, year, op=sector_lcoe) -def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: +def sector_lcoe( + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs +) -> pd.DataFrame: """Levelized cost of energy () of technologies over their lifetime.""" from muse.costs import levelized_cost_of_energy as LCOE from muse.quantities import capacity_to_service_demand, consumption @@ -490,13 +501,15 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data @register_output_quantity(name=["EAC"]) def metric_eac( - market: xr.Dataset, sectors: list[AbstractSector], **kwargs + market: xr.Dataset, sectors: list[AbstractSector], year: int, **kwargs ) -> pd.DataFrame: """Current emission costs across all sectors.""" - return _aggregate_sectors(sectors, market, op=sector_eac) + return _aggregate_sectors(sectors, market, year, op=sector_eac) -def sector_eac(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: +def sector_eac( + sector: AbstractSector, market: xr.Dataset, year: int, **kwargs +) -> pd.DataFrame: """Net Present Value of technologies over their lifetime.""" from muse.costs import equivalent_annual_cost as EAC from muse.quantities import capacity_to_service_demand, consumption diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 5eb95b93b..312fada94 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -107,7 +107,7 @@ def save_multiple_outputs(market, *args, year: int | None = None) -> list[Any]: year = int(market.year.max()) return [ - sink(quantity(market, *args), year=year) + sink(quantity(market, *args, year=year), year=year) for quantity, sink in zip(quantities, sinks) ] @@ -182,6 +182,7 @@ def consumption( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current consumption.""" moutput = market.copy(deep=True).reset_index("timeslice") @@ -202,6 +203,7 @@ def supply( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current supply.""" moutput = market.copy(deep=True).reset_index("timeslice") @@ -222,6 +224,7 @@ def costs( sum_over: list[str] | None = None, drop: list[str] | None = None, rounding: int = 4, + **kwargs, ) -> xr.DataArray: """Current costs.""" from muse.commodities import is_pollutant diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 01e4b7187..e7e4dee6d 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -281,10 +281,9 @@ def group_assets(x: xr.DataArray) -> xr.DataArray: # Convert result to global timeslicing scheme return self.convert_to_global_timeslicing(result) - def save_outputs(self) -> None: + def save_outputs(self, year: int) -> None: """Calls the outputs function with the current output data.""" - investment_year = self.output_data.year.values[1] - self.outputs(self.output_data, self.capacity, year=investment_year) + self.outputs(self.output_data, self.capacity, year=year) def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: """Computes resulting market: production, consumption, and costs.""" From ab14fd288fb6a5bd5697f4bc4dfed0056dde6762 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 09:45:45 +0000 Subject: [PATCH 07/22] Update mca.py --- src/muse/outputs/mca.py | 55 ++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 5aaf6cd14..6c32dc3ba 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -266,15 +266,14 @@ def sector_fuel_costs( agent_market = market.copy() if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast agent_market["consumption"] = (market.consumption * a.quantity).sel( - year=output_year + year=year ) commodity = is_fuel(technologies.comm_usage) capacity = a.filter_input( a.assets.capacity, - year=output_year, + year=year, ).fillna(0.0) production = supply( @@ -283,7 +282,7 @@ def sector_fuel_costs( technologies, ) - prices = a.filter_input(market.prices, year=output_year) + prices = a.filter_input(market.prices, year=year) fcons = consumption( technologies=technologies, production=production, prices=prices ) @@ -292,7 +291,7 @@ def sector_fuel_costs( data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "fuel_consumption_costs" ) @@ -324,18 +323,17 @@ def sector_capital_costs( if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast - capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0) + capacity = a.filter_input(a.assets.capacity, year=year).fillna(0.0) data = a.filter_input( technologies[["cap_par", "cap_exp"]], - year=output_year, + year=year, technology=capacity.technology, ) data_agent = distribute_timeslice(data.cap_par * (capacity**data.cap_exp)) data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "capital_costs" ) @@ -371,23 +369,22 @@ def sector_emission_costs( agent_market = market.copy() if len(technologies) > 0: for a in agents: - output_year = a.year - a.forecast agent_market["consumption"] = (market.consumption * a.quantity).sel( - year=output_year + year=year ) - capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0) + capacity = a.filter_input(a.assets.capacity, year=year).fillna(0.0) allemissions = a.filter_input( technologies.fixed_outputs, commodity=is_pollutant(technologies.comm_usage), technology=capacity.technology, - year=output_year, + year=year, ) envs = is_pollutant(technologies.comm_usage) enduses = is_enduse(technologies.comm_usage) i = (np.where(envs))[0][0] red_envs = envs[i].commodity.values - prices = a.filter_input(market.prices, year=output_year, commodity=red_envs) + prices = a.filter_input(market.prices, year=year, commodity=red_envs) production = supply( agent_market, capacity, @@ -399,7 +396,7 @@ def sector_emission_costs( data_agent["agent"] = a.name data_agent["category"] = a.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "emission_costs" ) @@ -438,8 +435,7 @@ def sector_lcoe( agents = retro if len(retro) > 0 else new if len(technologies) > 0: for agent in agents: - output_year = agent.year - agent.forecast - agent_market = market.sel(year=output_year).copy() + agent_market = market.sel(year=agent.year).copy() agent_market["consumption"] = agent_market.consumption * agent.quantity included = [ i @@ -450,16 +446,15 @@ def sector_lcoe( i for i in agent_market["commodity"].values if i not in included ] agent_market.loc[dict(commodity=excluded)] = 0 - years = [output_year, agent.year] - agent_market["prices"] = agent.filter_input(market["prices"], year=years) + agent_market["prices"] = agent.filter_input( + market["prices"], year=agent.year + ) techs = agent.filter_input( technologies, year=agent.year, ) - prices = agent_market["prices"].sel( - commodity=techs.commodity, year=agent.year - ) + prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( @@ -484,7 +479,7 @@ def sector_lcoe( data_agent["agent"] = agent.name data_agent["category"] = agent.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = agent.year data_agent = data_agent.fillna(0) data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "LCOE" @@ -523,8 +518,7 @@ def sector_eac( agents = retro if len(retro) > 0 else new if len(technologies) > 0: for agent in agents: - output_year = agent.year - agent.forecast - agent_market = market.sel(year=output_year).copy() + agent_market = market.sel(year=agent.year).copy() agent_market["consumption"] = agent_market.consumption * agent.quantity included = [ i @@ -535,16 +529,15 @@ def sector_eac( i for i in agent_market["commodity"].values if i not in included ] agent_market.loc[dict(commodity=excluded)] = 0 - years = [output_year, agent.year] - agent_market["prices"] = agent.filter_input(market["prices"], year=years) + agent_market["prices"] = agent.filter_input( + market["prices"], year=agent.year + ) techs = agent.filter_input( technologies, year=agent.year, ) - prices = agent_market["prices"].sel( - commodity=techs.commodity, year=agent.year - ) + prices = agent_market["prices"].sel(commodity=techs.commodity) demand = agent_market.consumption.sel(commodity=included) capacity = agent.filter_input(capacity_to_service_demand(demand, techs)) production = ( @@ -568,7 +561,7 @@ def sector_eac( data_agent["agent"] = agent.name data_agent["category"] = agent.category data_agent["sector"] = getattr(sector, "name", "unnamed") - data_agent["year"] = output_year + data_agent["year"] = agent.year data_agent = multiindex_to_coords(data_agent, "timeslice").to_dataframe( "capital_costs" ) From 0c8d05c4bbc977337f9de6044be5e2c40b0ee87e Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 09:46:47 +0000 Subject: [PATCH 08/22] Remove foresight parameter (#641) * Move broadcast_techs out of quantities module * Update _inner_split * Fix trade model * Fix constraints tests * Fix demand_share tests * Fix quantities tests * Fix trade tests * Fix adhoc model * Rename broadcast_techs to broadcast_over_assets * Better docstring, rename argument * Delete filter_with_template * Remove `broadcast_over_assets` from `capacity_in_use` * Fix trade tests * Edit TODO * Remove foresight parameter * Update settings and documentation * Temporarily suppress test * Fix carbon budget framework * Revert change to settings * Update settings and documentation * Revert change to settings * Update results * Small changes to fix tests * Add warning about deprecated parameter * Clarify log messages * Better final message --- .../Results/MCACapacity.csv | 27 -------- .../1-single-objective/Results/MCAPrices.csv | 24 ------- .../Results/MCACapacity.csv | 25 ------- .../Results/MCAPrices.csv | 24 ------- .../1-correlation/Results/MCACapacity.csv | 10 --- .../1-correlation/Results/MCAPrices.csv | 24 ------- .../1-introduction/Results/MCACapacity.csv | 7 -- .../1-introduction/Results/MCAPrices.csv | 24 ------- .../2-scenario/Results/MCACapacity.csv | 10 --- .../2-scenario/Results/MCAPrices.csv | 24 ------- .../1-new-region/Results/MCACapacity.csv | 24 ------- .../1-new-region/Results/MCAPrices.csv | 48 -------------- .../Results/MCACapacity.csv | 12 ---- .../1-exogenous-demand/Results/MCAPrices.csv | 30 --------- .../1-carbon-budget/Results/MCACapacity.csv | 7 -- .../1-carbon-budget/Results/MCAPrices.csv | 24 ------- .../1-carbon-budget/Results/MCASupply.csv | 24 ------- .../1-min-constraint/Results/MCACapacity.csv | 7 -- .../1-min-constraint/Results/MCAPrices.csv | 24 ------- .../1-min-constraint/Results/Power_Supply.csv | 66 +++++++------------ .../2-max-constraint/Results/MCACapacity.csv | 7 -- .../2-max-constraint/Results/MCAPrices.csv | 24 ------- .../2-max-constraint/Results/Power_Supply.csv | 62 ++++++----------- .../Results/MCACapacity.csv | 12 ---- .../1-modify-timeslices/Results/MCAPrices.csv | 32 --------- .../Results/MCACapacity.csv | 23 ------- .../Results/MCAPrices.csv | 32 --------- .../Results/MCACapacity.csv | 11 ---- .../new-decision-metric/Results/MCAPrices.csv | 24 ------- .../default/Results/MCACapacity.csv | 11 ---- .../default/Results/MCAPrices.csv | 24 ------- .../default_adhoc/Results/MCACapacity.csv | 7 -- .../default_adhoc/Results/MCAPrices.csv | 24 ------- .../default_retro/Results/MCACapacity.csv | 11 ---- .../default_retro/Results/MCAPrices.csv | 24 ------- .../default_timeslice/Results/MCACapacity.csv | 7 -- .../default_timeslice/Results/MCAPrices.csv | 24 ------- .../Results/Power_Supply.csv | 30 --------- .../medium/Results/MCACapacity.csv | 15 ----- .../medium/Results/MCAPrices.csv | 30 --------- .../minimum_service/Results/MCACapacity.csv | 4 -- .../minimum_service/Results/MCAPrices.csv | 12 ---- .../minimum_service/Results/MCASupply.csv | 6 -- .../multiple_agents/Results/MCACapacity.csv | 13 ---- .../multiple_agents/Results/MCAPrices.csv | 24 ------- .../trade/Results/MCACapacity.csv | 9 --- .../trade/Results/MCAPrices.csv | 36 ---------- 47 files changed, 44 insertions(+), 959 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 60d99538d..a2a1428bf 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 @@ -85,30 +85,3 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 -A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 -A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050 -A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 -A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index e6c8eaafc..b9dff7326 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 @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 0b57e81ba..a2a1428bf 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 @@ -85,28 +85,3 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 -A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 -A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 5771c156f..b9dff7326 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 5947be655..02933447d 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 @@ -35,13 +35,3 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,6.88560000000,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 e669d1f9c..fd4404535 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index b184a9a14..cfffaea2e 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 @@ -27,10 +27,3 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,22.75000000000,R1,2050,R1,power,solarPV,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 7e4ef3ab2..49a667e78 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 @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 1bbe53689..56330652c 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 @@ -40,13 +40,3 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index e0d3454dc..a77929792 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 @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.24100000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,12.60410000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,12.60410000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,12.60410000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,12.60410000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,12.60410000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,12.60410000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 6cdbd733b..77a6c624b 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 @@ -93,27 +93,3 @@ A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045 A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 -A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 -A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050 -A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,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 4bbcc9f7d..0589f589a 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 @@ -239,51 +239,3 @@ heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index 49cf85daa..bde8aa344 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 @@ -50,15 +50,3 @@ A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index cd340e848..d7fc63f18 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 @@ -149,33 +149,3 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index 3d9fce8f8..e94fdd34b 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 @@ -10,10 +10,3 @@ A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 -A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 -A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index dd1d01f86..47709211b 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -47,27 +47,3 @@ electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index 7dea0bcaf..d094cbd87 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 @@ -47,27 +47,3 @@ electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index e3140c1fe..5861aa7a7 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -27,10 +27,3 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 1521a4c86..272535ca2 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 @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index d2eae66c7..18ed2f4cb 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,4 +1,16 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025 @@ -17,18 +29,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -101,33 +113,3 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 142fab7f9..1bb758e35 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -27,10 +27,3 @@ A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index e3a5d844d..22d40f0b6 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 @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 07ea1c621..1e62a502c 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,4 +1,12 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020 +0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025 @@ -17,18 +25,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -101,33 +109,3 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index a4def5fe6..ead23be6f 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 @@ -48,15 +48,3 @@ A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 4b1a545dd..8ee30c863 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -159,35 +159,3 @@ electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.84580000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,15.84580000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,15.84580000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,15.84580000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,15.84580000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050 -CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 -CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index fdb0f6460..a64d141fe 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -135,26 +135,3 @@ A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 -A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 -A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 -A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 -A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 -A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 -A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index bb2d0dc7e..a7a74928c 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 @@ -287,35 +287,3 @@ electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,12.70910000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.97240000000,R1,0,MUS$2010/PJ,2040 -CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.97240000000,R1,1,MUS$2010/PJ,2040 -CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,12.97240000000,R1,2,MUS$2010/PJ,2040 -CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.97240000000,R1,3,MUS$2010/PJ,2040 -CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.97240000000,R1,4,MUS$2010/PJ,2040 -CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.97240000000,R1,5,MUS$2010/PJ,2040 -CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,12.97240000000,R1,6,MUS$2010/PJ,2040 -CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,12.97240000000,R1,7,MUS$2010/PJ,2040 -CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index b205d4edc..236b5ac1c 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -44,14 +44,3 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 -A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index f0a939173..f9b356037 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.46670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.68810000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.68810000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index be00adca3..927524d7c 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -44,14 +44,3 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 4f2bbd3bd..c183760f6 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 3a0814abe..e3863af4d 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -27,10 +27,3 @@ A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 381fbb6d7..4703bb6c5 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index 70d333ac5..b98f6c65c 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -41,14 +41,3 @@ A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 -A1,6.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 -A1,17.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 -A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 -A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 -A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 -A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index ba64b4a2b..e14c07e32 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,13.09670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.65350000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.65350000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.65350000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.65350000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.65350000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.65350000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index e3140c1fe..5861aa7a7 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -27,10 +27,3 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 -A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 9457c87ef..48797fda7 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index eb692f925..4f61fa506 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -101,33 +101,3 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 -2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 -5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index a0f67debf..fbd9e148a 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -52,18 +52,3 @@ A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 -A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 -A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 -A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 5766b9798..2b67fc111 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -149,33 +149,3 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,10.60310000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.60310000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,10.60310000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.60310000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,10.60310000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,10.60310000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 9a1fe1c4b..1e377bcc7 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -35,7 +35,3 @@ A1,8.70630000000,R1,2030,R1,industry,procammonia_1,newcapa,2045 A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2045 A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2045 A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2045 -A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2050 -A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2050 -A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050 -A1,7.21970000000,R1,2050,R1,industry,procammonia_1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 2db12b399..45718f0d0 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -83,15 +83,3 @@ fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 -fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 -fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 -fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 -fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 -fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 -fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 -fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 -fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 -fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index ad5f7b9a5..17cd6de69 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -41,9 +41,3 @@ ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,R1,58000.48940000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,R1,56294.59260000000,2,MUS$2010/kt,2045 -ammonia,all-week,all-day,winter,R1,13.74870000000,0,MUS$2010/Mt,2050 -CO2f,all-week,all-day,winter,R1,54623.16370000000,0,MUS$2010/kt,2050 -ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 -CO2f,all-week,all-day,summer,R1,56035.99150000000,1,MUS$2010/kt,2050 -ammonia,all-week,all-day,spring-autumn,R1,13.74870000000,2,MUS$2010/Mt,2050 -CO2f,all-week,all-day,spring-autumn,R1,54623.16370000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index d090e767d..e36a70243 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -54,16 +54,3 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 -A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 -A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 4f2bbd3bd..c183760f6 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -119,27 +119,3 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 -CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 -CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 -CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 -CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 -CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 -CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index 5e0c57c73..eaa0ffa36 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -13,12 +13,3 @@ A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 -A1,18.63330000000,R1,2035,R1,residential,heatpump,newcapa,2035 -A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 -A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,326.11050000000,R1,2035,R1,residential,heatpump,retrofit,2035 -A1,0.38330000000,R2,2035,R2,residential,heatpump,newcapa,2035 -A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 -A1,18.40000000000,R2,2035,R2,residential,heatpump,retrofit,2035 -A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 -A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 200371bd2..a9c0561c1 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -65,39 +65,3 @@ gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035 From ad7bdcf2599d5d9f03e42356c3c19fdbc4064387 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 10:15:02 +0000 Subject: [PATCH 09/22] Update results --- .../Results/MCACapacity.csv | 6 +++ .../1-single-objective/Results/MCAPrices.csv | 24 ++++++++++ .../Results/MCACapacity.csv | 6 +++ .../Results/MCAPrices.csv | 24 ++++++++++ .../1-correlation/Results/MCACapacity.csv | 3 ++ .../1-correlation/Results/MCAPrices.csv | 24 ++++++++++ .../1-introduction/Results/MCACapacity.csv | 3 ++ .../1-introduction/Results/MCAPrices.csv | 24 ++++++++++ .../2-scenario/Results/MCACapacity.csv | 3 ++ .../2-scenario/Results/MCAPrices.csv | 24 ++++++++++ .../1-new-region/Results/MCACapacity.csv | 6 +++ .../1-new-region/Results/MCAPrices.csv | 48 +++++++++++++++++++ .../Results/MCACapacity.csv | 4 ++ .../1-exogenous-demand/Results/MCAPrices.csv | 30 ++++++++++++ .../1-carbon-budget/Results/MCACapacity.csv | 3 ++ .../1-carbon-budget/Results/MCAPrices.csv | 24 ++++++++++ .../1-carbon-budget/Results/MCASupply.csv | 18 +++++++ .../1-min-constraint/Results/MCACapacity.csv | 3 ++ .../1-min-constraint/Results/MCAPrices.csv | 24 ++++++++++ .../2-max-constraint/Results/MCACapacity.csv | 3 ++ .../2-max-constraint/Results/MCAPrices.csv | 24 ++++++++++ .../Results/MCACapacity.csv | 3 ++ .../1-modify-timeslices/Results/MCAPrices.csv | 32 +++++++++++++ .../Results/MCACapacity.csv | 3 ++ .../Results/MCAPrices.csv | 32 +++++++++++++ .../Results/MCACapacity.csv | 3 ++ .../new-decision-metric/Results/MCAPrices.csv | 24 ++++++++++ .../default/Results/MCACapacity.csv | 3 ++ .../default/Results/MCAPrices.csv | 24 ++++++++++ .../default_adhoc/Results/MCACapacity.csv | 3 ++ .../default_adhoc/Results/MCAPrices.csv | 24 ++++++++++ .../default_retro/Results/MCACapacity.csv | 3 ++ .../default_retro/Results/MCAPrices.csv | 24 ++++++++++ .../default_timeslice/Results/MCACapacity.csv | 3 ++ .../default_timeslice/Results/MCAPrices.csv | 24 ++++++++++ .../medium/Results/MCACapacity.csv | 4 ++ .../medium/Results/MCAPrices.csv | 30 ++++++++++++ .../minimum_service/Results/MCACapacity.csv | 2 + .../minimum_service/Results/MCAPrices.csv | 12 +++++ .../minimum_service/Results/MCASupply.csv | 6 +++ .../multiple_agents/Results/MCACapacity.csv | 4 ++ .../multiple_agents/Results/MCAPrices.csv | 24 ++++++++++ .../trade/Results/MCACapacity.csv | 6 +++ .../trade/Results/MCAPrices.csv | 24 ++++++++++ 44 files changed, 645 insertions(+) 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 a2a1428bf..ea0c8ef96 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 @@ -1,4 +1,10 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 +A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 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 b9dff7326..7964d0a1e 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025 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 a2a1428bf..ea0c8ef96 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 @@ -1,4 +1,10 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 +A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 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 b9dff7326..7964d0a1e 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025 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 02933447d..0f784f8f5 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 @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 fd4404535..618937468 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.19960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.02330000000,R1,0,MUS$2010/PJ,2025 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 cfffaea2e..593bcae69 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 @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 49a667e78..8be0b1287 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,15.50320000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,9.78050000000,R1,0,MUS$2010/PJ,2025 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 56330652c..9397c720e 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 @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 a77929792..96680e9a7 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 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 77a6c624b..255cc0ec0 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 @@ -1,4 +1,10 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,10.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 +A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 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 0589f589a..14c564667 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 @@ -1,4 +1,52 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,19.50000000000,R2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R2,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +CO2f,all-week,night,all-year,0.08310000000,R2,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.50000000000,R2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R2,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +CO2f,all-week,morning,all-year,0.08310000000,R2,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R2,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R2,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R2,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R2,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R2,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R2,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.50000000000,R2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 electricity,all-week,night,all-year,19.97590000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 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 bde8aa344..c8b104bfe 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 @@ -1,4 +1,8 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 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 d7fc63f18..f4b0bf1b4 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 @@ -1,4 +1,34 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,18.98780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.53590000000,R1,0,MUS$2010/PJ,2025 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 e94fdd34b..357e67807 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 @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 47709211b..a7505cb8c 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.58490000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.15980000000,R1,0,MUS$2010/PJ,2025 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 d094cbd87..27166a56d 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 @@ -1,4 +1,22 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year +gas,all-week,night,all-year,R1,1.16000000000,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,R1,1.00000000000,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,R1,64.71000000000,0,MUS$2010/kt,2020 +gas,all-week,morning,all-year,R1,1.74000000000,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,R1,1.50000000000,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,R1,97.06500000000,1,MUS$2010/kt,2020 +gas,all-week,afternoon,all-year,R1,1.16000000000,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,R1,1.00000000000,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,R1,64.71000000000,2,MUS$2010/kt,2020 +gas,all-week,early-peak,all-year,R1,1.74000000000,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,R1,1.50000000000,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,R1,97.06500000000,3,MUS$2010/kt,2020 +gas,all-week,late-peak,all-year,R1,1.93330000000,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,R1,1.66670000000,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,R1,107.85000000000,4,MUS$2010/kt,2020 +gas,all-week,evening,all-year,R1,1.93330000000,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,R1,1.66670000000,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,R1,107.85000000000,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,R1,0.42220000000,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,R1,0.40570000000,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,R1,1.33330000000,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index 5861aa7a7..4cc29c1f0 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 272535ca2..9c7ec3faa 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,8.75610000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.68250000000,R1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 1bb758e35..48b275d9e 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,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 22d40f0b6..336d4aa92 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 @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,9.07710000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.76030000000,R1,0,MUS$2010/PJ,2025 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 ead23be6f..25cfe1164 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 @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 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 8ee30c863..2aa26615c 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 @@ -1,4 +1,36 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 +CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 +electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 +CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.96230000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.77760000000,R1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index a64d141fe..a6805883c 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2022 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 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 a7a74928c..7b7db94e1 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 @@ -1,4 +1,36 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,mid-afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,mid-afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +electricity,all-week,early-morning,all-year,19.50000000000,R1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,7.15280000000,R1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,100.00000000000,R1,6,MUS$2010/PJ,2020 +CO2f,all-week,early-morning,all-year,0.08310000000,R1,6,MUS$2010/kt,2020 +electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 +CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,17.85770000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 heat,all-week,night,all-year,9.94600000000,R1,0,MUS$2010/PJ,2022 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 236b5ac1c..63229b23f 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index f9b356037..ea92faa3c 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,17.00150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,9.90690000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 927524d7c..8c271eae7 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index c183760f6..5b0ca6dc2 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index e3863af4d..3dae1b300 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 4703bb6c5..7336a95aa 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.26000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.65340000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index b98f6c65c..88c0d8515 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 A1,13.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index e14c07e32..9c7507365 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.91890000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index 5861aa7a7..4cc29c1f0 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -1,4 +1,7 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 48797fda7..cd458e05d 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,8.84520000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,7.71080000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index fbd9e148a..ca4c99ade 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -1,4 +1,8 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,8.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2025 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 2b67fc111..e35561fc7 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -1,4 +1,34 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +cook,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +cook,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +cook,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +cook,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +cook,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 +cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.45710000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 1e377bcc7..638edd772 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -1,4 +1,6 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,26.00000000000,R1,2010,R1,industry,procammonia_1,newcapa,2010 +A1,26.00000000000,R1,2010,R1,industry,procammonia_2,newcapa,2010 A1,21.66670000000,R1,2010,R1,industry,procammonia_1,newcapa,2015 A1,8.47450000000,R1,2015,R1,industry,procammonia_1,newcapa,2015 A1,21.66670000000,R1,2010,R1,industry,procammonia_2,newcapa,2015 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 45718f0d0..65a63033f 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -1,4 +1,16 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +fuel3,all-week,all-day,winter,0.05330000000,R1,0,MUS$2010/PJ,2010 +fuel1,all-week,all-day,winter,1.00000000000,R1,0,MUS$2010/PJ,2010 +fuel2,all-week,all-day,winter,9.55120000000,R1,0,MUS$2010/PJ,2010 +ammonia,all-week,all-day,winter,321.15000000000,R1,0,MUS$2010/Mt,2010 +fuel3,all-week,all-day,summer,0.05330000000,R1,1,MUS$2010/PJ,2010 +fuel1,all-week,all-day,summer,1.00000000000,R1,1,MUS$2010/PJ,2010 +fuel2,all-week,all-day,summer,9.55120000000,R1,1,MUS$2010/PJ,2010 +ammonia,all-week,all-day,summer,321.15000000000,R1,1,MUS$2010/Mt,2010 +fuel3,all-week,all-day,spring-autumn,0.05330000000,R1,2,MUS$2010/PJ,2010 +fuel1,all-week,all-day,spring-autumn,1.00000000000,R1,2,MUS$2010/PJ,2010 +fuel2,all-week,all-day,spring-autumn,9.55120000000,R1,2,MUS$2010/PJ,2010 +ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index 17cd6de69..fc0955d32 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -1,4 +1,10 @@ commodity,day,hour,month,region,supply,timeslice,units_prices,year +ammonia,all-week,all-day,winter,R1,14.73330000000,0,MUS$2010/Mt,2010 +CO2f,all-week,all-day,winter,R1,53628.56500000000,0,MUS$2010/kt,2010 +ammonia,all-week,all-day,summer,R1,14.73330000000,1,MUS$2010/Mt,2010 +CO2f,all-week,all-day,summer,R1,53628.56500000000,1,MUS$2010/kt,2010 +ammonia,all-week,all-day,spring-autumn,R1,14.73330000000,2,MUS$2010/Mt,2010 +CO2f,all-week,all-day,spring-autumn,R1,53628.56500000000,2,MUS$2010/kt,2010 ammonia,all-week,all-day,winter,R1,14.92000000000,0,MUS$2010/Mt,2015 CO2f,all-week,all-day,winter,R1,55092.44800000000,0,MUS$2010/kt,2015 ammonia,all-week,all-day,summer,R1,15.37220000000,1,MUS$2010/Mt,2015 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index e36a70243..e5426235c 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -1,4 +1,8 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index c183760f6..5b0ca6dc2 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,19.50000000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,7.15280000000,R1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,100.00000000000,R1,0,MUS$2010/PJ,2020 +CO2f,all-week,night,all-year,0.08310000000,R1,0,MUS$2010/kt,2020 +electricity,all-week,morning,all-year,19.50000000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,7.15280000000,R1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,100.00000000000,R1,1,MUS$2010/PJ,2020 +CO2f,all-week,morning,all-year,0.08310000000,R1,1,MUS$2010/kt,2020 +electricity,all-week,afternoon,all-year,19.50000000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,7.15280000000,R1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,100.00000000000,R1,2,MUS$2010/PJ,2020 +CO2f,all-week,afternoon,all-year,0.08310000000,R1,2,MUS$2010/kt,2020 +electricity,all-week,early-peak,all-year,19.50000000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,7.15280000000,R1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,100.00000000000,R1,3,MUS$2010/PJ,2020 +CO2f,all-week,early-peak,all-year,0.08310000000,R1,3,MUS$2010/kt,2020 +electricity,all-week,late-peak,all-year,19.50000000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,7.15280000000,R1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,100.00000000000,R1,4,MUS$2010/PJ,2020 +CO2f,all-week,late-peak,all-year,0.08310000000,R1,4,MUS$2010/kt,2020 +electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 +CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index eaa0ffa36..f885037bd 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -1,4 +1,10 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year +A1,662.76000000000,R1,2010,R1,residential,gasboiler,retrofit,2020 +A1,35.00000000000,R2,2010,R2,residential,gasboiler,retrofit,2020 +A1,240.00000000000,R1,2010,R1,power,gasCCGT,agent,2020 +A1,200.00000000000,R2,2010,R2,power,gasCCGT,agent,2020 +A1,3000.00000000000,R1,2010,R1,gas,gassupply1,agent,2020 +A1,1200.00000000000,R2,2010,R2,gas,gassupply1,agent,2020 A1,74.53330000000,R1,2025,R1,residential,heatpump,newcapa,2025 A1,563.34600000000,R1,2010,R1,residential,gasboiler,retrofit,2025 A1,181.98730000000,R1,2025,R1,residential,heatpump,retrofit,2025 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index a9c0561c1..870a82ba8 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,4 +1,28 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year +electricity,all-week,night,all-year,13.98150000000,R1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,19.13890000000,R2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,4.71680000000,R1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,4.71680000000,R2,0,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,13.98150000000,R1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.13890000000,R2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,4.71680000000,R1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,4.71680000000,R2,1,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,13.98150000000,R1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.13890000000,R2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,4.71680000000,R1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,4.71680000000,R2,2,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,13.98150000000,R1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.13890000000,R2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,4.71680000000,R1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,4.71680000000,R2,3,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,13.98150000000,R1,4,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.13890000000,R2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,4.71680000000,R1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,4.71680000000,R2,4,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,29.38390000000,R1,0,MUS$2010/PJ,2025 electricity,all-week,night,all-year,25.66110000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,14.62380000000,R1,0,MUS$2010/PJ,2025 From a4d0d96deb1396404c9070ddbc35a6f081471d70 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 10:22:18 +0000 Subject: [PATCH 10/22] Actually update results --- .../default/Results/MCACapacity.csv | 11 ++++++ .../default/Results/MCAPrices.csv | 24 +++++++++++++ .../default_adhoc/Results/MCACapacity.csv | 7 ++++ .../default_adhoc/Results/MCAPrices.csv | 24 +++++++++++++ .../default_retro/Results/MCACapacity.csv | 11 ++++++ .../default_retro/Results/MCAPrices.csv | 24 +++++++++++++ .../default_timeslice/Results/MCACapacity.csv | 7 ++++ .../default_timeslice/Results/MCAPrices.csv | 24 +++++++++++++ .../Results/Power_Supply.csv | 30 ++++++++++++++++ .../medium/Results/MCACapacity.csv | 15 ++++++++ .../medium/Results/MCAPrices.csv | 30 ++++++++++++++++ .../minimum_service/Results/MCACapacity.csv | 4 +++ .../minimum_service/Results/MCAPrices.csv | 12 +++++++ .../minimum_service/Results/MCASupply.csv | 6 ++++ .../multiple_agents/Results/MCACapacity.csv | 13 +++++++ .../multiple_agents/Results/MCAPrices.csv | 24 +++++++++++++ .../trade/Results/MCACapacity.csv | 9 +++++ .../trade/Results/MCAPrices.csv | 36 +++++++++++++++++++ 18 files changed, 311 insertions(+) diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 8c271eae7..9d6707290 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -47,3 +47,14 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 5b0ca6dc2..94a1a3b81 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv index 3dae1b300..1697de22d 100644 --- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv +++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 7336a95aa..6cfb41719 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index 88c0d8515..9e0d65a5d 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -44,3 +44,14 @@ A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045 +A1,6.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050 +A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 9c7507365..a42f1fbfa 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,13.09670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.65350000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.65350000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.65350000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.65350000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.65350000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.65350000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv index 4cc29c1f0..fb43c23d0 100644 --- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index cd458e05d..98e28b6bf 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 4f61fa506..eb692f925 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -101,3 +101,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index ca4c99ade..47c2dd664 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -56,3 +56,18 @@ A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050 +A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index e35561fc7..e3ddfa9ba 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -179,3 +179,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,10.60310000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.60310000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,10.60310000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.60310000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,10.60310000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,10.60310000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCACapacity.csv b/tests/example_outputs/minimum_service/Results/MCACapacity.csv index 638edd772..28d815ddd 100644 --- a/tests/example_outputs/minimum_service/Results/MCACapacity.csv +++ b/tests/example_outputs/minimum_service/Results/MCACapacity.csv @@ -37,3 +37,7 @@ A1,8.70630000000,R1,2030,R1,industry,procammonia_1,newcapa,2045 A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2045 A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2045 A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2045 +A1,18.79580000000,R1,2035,R1,industry,procammonia_1,newcapa,2050 +A1,16.54120000000,R1,2040,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2045,R1,industry,procammonia_1,newcapa,2050 +A1,7.21970000000,R1,2050,R1,industry,procammonia_1,newcapa,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 65a63033f..0d4aa4dd2 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -95,3 +95,15 @@ fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 ammonia,all-week,all-day,spring-autumn,458.21660000000,R1,2,MUS$2010/Mt,2045 +fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 +fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 +fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 +ammonia,all-week,all-day,winter,455.91800000000,R1,0,MUS$2010/Mt,2050 +fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 +fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 +fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 +ammonia,all-week,all-day,summer,455.94940000000,R1,1,MUS$2010/Mt,2050 +fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 +fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 +fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 +ammonia,all-week,all-day,spring-autumn,455.91800000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCASupply.csv b/tests/example_outputs/minimum_service/Results/MCASupply.csv index fc0955d32..86ac2073f 100644 --- a/tests/example_outputs/minimum_service/Results/MCASupply.csv +++ b/tests/example_outputs/minimum_service/Results/MCASupply.csv @@ -47,3 +47,9 @@ ammonia,all-week,all-day,summer,R1,14.52450000000,1,MUS$2010/Mt,2045 CO2f,all-week,all-day,summer,R1,58000.48940000000,1,MUS$2010/kt,2045 ammonia,all-week,all-day,spring-autumn,R1,14.09730000000,2,MUS$2010/Mt,2045 CO2f,all-week,all-day,spring-autumn,R1,56294.59260000000,2,MUS$2010/kt,2045 +ammonia,all-week,all-day,winter,R1,13.74870000000,0,MUS$2010/Mt,2050 +CO2f,all-week,all-day,winter,R1,54623.16370000000,0,MUS$2010/kt,2050 +ammonia,all-week,all-day,summer,R1,14.10330000000,1,MUS$2010/Mt,2050 +CO2f,all-week,all-day,summer,R1,56035.99150000000,1,MUS$2010/kt,2050 +ammonia,all-week,all-day,spring-autumn,R1,13.74870000000,2,MUS$2010/Mt,2050 +CO2f,all-week,all-day,spring-autumn,R1,54623.16370000000,2,MUS$2010/kt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index e5426235c..4609502be 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -58,3 +58,16 @@ A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 5b0ca6dc2..94a1a3b81 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCACapacity.csv b/tests/example_outputs/trade/Results/MCACapacity.csv index f885037bd..cb451056e 100644 --- a/tests/example_outputs/trade/Results/MCACapacity.csv +++ b/tests/example_outputs/trade/Results/MCACapacity.csv @@ -19,3 +19,12 @@ A1,153.60000000000,R1,2010,R1,power,gasCCGT,agent,2030 A1,98.00000000000,R2,2010,R2,power,gasCCGT,agent,2030 A1,2100.00000000000,R1,2010,R1,gas,gassupply1,agent,2030 A1,700.00000000000,R2,2010,R2,gas,gassupply1,agent,2030 +A1,18.63330000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,394.34220000000,R1,2010,R1,residential,gasboiler,retrofit,2035 +A1,173.94730000000,R1,2030,R1,residential,heatpump,retrofit,2035 +A1,326.11050000000,R1,2035,R1,residential,heatpump,retrofit,2035 +A1,0.38330000000,R2,2035,R2,residential,heatpump,newcapa,2035 +A1,20.82500000000,R2,2010,R2,residential,gasboiler,retrofit,2035 +A1,18.40000000000,R2,2035,R2,residential,heatpump,retrofit,2035 +A1,122.88000000000,R1,2010,R1,power,gasCCGT,agent,2035 +A1,68.60000000000,R2,2010,R2,power,gasCCGT,agent,2035 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 870a82ba8..5f44b6145 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -89,3 +89,39 @@ gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035 From 853a845d189969f8689a4f503d2e7e92b1bc5077 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 10:26:14 +0000 Subject: [PATCH 11/22] And more --- .../Results/MCACapacity.csv | 27 ++++++++++ .../1-single-objective/Results/MCAPrices.csv | 24 +++++++++ .../Results/MCACapacity.csv | 25 +++++++++ .../Results/MCAPrices.csv | 24 +++++++++ .../1-correlation/Results/MCACapacity.csv | 10 ++++ .../1-correlation/Results/MCAPrices.csv | 24 +++++++++ .../1-introduction/Results/MCACapacity.csv | 7 +++ .../1-introduction/Results/MCAPrices.csv | 24 +++++++++ .../2-scenario/Results/MCACapacity.csv | 10 ++++ .../2-scenario/Results/MCAPrices.csv | 24 +++++++++ .../1-new-region/Results/MCACapacity.csv | 24 +++++++++ .../1-new-region/Results/MCAPrices.csv | 48 +++++++++++++++++ .../Results/MCACapacity.csv | 12 +++++ .../1-exogenous-demand/Results/MCAPrices.csv | 30 +++++++++++ .../1-carbon-budget/Results/MCACapacity.csv | 7 +++ .../1-carbon-budget/Results/MCAPrices.csv | 24 +++++++++ .../1-carbon-budget/Results/MCASupply.csv | 24 +++++++++ .../1-min-constraint/Results/MCACapacity.csv | 7 +++ .../1-min-constraint/Results/MCAPrices.csv | 24 +++++++++ .../1-min-constraint/Results/Power_Supply.csv | 54 ++++++++++++++----- .../2-max-constraint/Results/MCACapacity.csv | 7 +++ .../2-max-constraint/Results/MCAPrices.csv | 24 +++++++++ .../2-max-constraint/Results/Power_Supply.csv | 54 ++++++++++++++----- .../Results/MCACapacity.csv | 12 +++++ .../1-modify-timeslices/Results/MCAPrices.csv | 32 +++++++++++ .../Results/MCACapacity.csv | 23 ++++++++ .../Results/MCAPrices.csv | 32 +++++++++++ .../Results/MCACapacity.csv | 11 ++++ .../new-decision-metric/Results/MCAPrices.csv | 24 +++++++++ 29 files changed, 648 insertions(+), 24 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 ea0c8ef96..d3f0aeb81 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -91,3 +91,30 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 7964d0a1e..94c5c0571 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index ea0c8ef96..08471d84e 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -91,3 +91,28 @@ A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045 +A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 +A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050 +A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 7964d0a1e..ba2ac2718 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 0f784f8f5..0c2b73d2f 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 @@ -38,3 +38,13 @@ A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,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 618937468..f806474f7 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 593bcae69..d0767bf6a 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 @@ -30,3 +30,10 @@ A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,22.75000000000,R1,2050,R1,power,solarPV,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 8be0b1287..46b6e12bb 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 9397c720e..1d0a03115 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -43,3 +43,13 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 96680e9a7..5147a8c94 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,12.24100000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.60410000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.60410000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.60410000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.60410000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.60410000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.60410000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 255cc0ec0..960a24355 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 @@ -99,3 +99,27 @@ A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045 A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 +A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050 +A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 +A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050 +A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,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 14c564667..b9ced2d02 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 @@ -287,3 +287,51 @@ heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index c8b104bfe..5012430c6 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 @@ -54,3 +54,15 @@ A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index f4b0bf1b4..bf7c1af91 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 @@ -179,3 +179,33 @@ gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv index 357e67807..c0aced739 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 @@ -13,3 +13,10 @@ A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030 A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035 +A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035 +A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035 +A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index a7505cb8c..c5d5c2055 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 @@ -71,3 +71,27 @@ electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv index 27166a56d..f1a5fe685 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 @@ -65,3 +65,27 @@ electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv index 4cc29c1f0..fb43c23d0 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 9c7ec3faa..c3a1eb9c9 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv index 18ed2f4cb..282fa0e44 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 @@ -29,18 +29,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -113,3 +113,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv index 48b275d9e..7d122ba67 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv @@ -30,3 +30,10 @@ A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 336d4aa92..6e9e1ba96 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 @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.47740000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.47740000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.47740000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.47740000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.47740000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.47740000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv index 1e62a502c..5aec78050 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 @@ -25,18 +25,18 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025 0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 -0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 -1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030 0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035 1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035 @@ -109,3 +109,33 @@ asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,tim 2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050 +1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050 +2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050 +5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 25cfe1164..b57a8cc6a 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 @@ -51,3 +51,15 @@ A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045 A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050 +A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 2aa26615c..8062d64f0 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 @@ -191,3 +191,35 @@ electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,204 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 +electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.84580000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,15.84580000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,15.84580000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,15.84580000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,15.84580000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 +electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050 +CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 +electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050 +CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index a6805883c..a1cf35c01 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -138,3 +138,26 @@ A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038 A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038 +A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040 +A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040 +A1,3.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040 +A1,2.04000000000,R1,2022,R1,power,windturbine,newcapa,2040 +A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040 +A1,1.99110000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,0.56920000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,2.06920000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,3.56920000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,2.75420000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2036,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 7b7db94e1..bcd61a467 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 @@ -319,3 +319,35 @@ electricity,all-week,late-afternoon,all-year,25.52450000000,R1,7,MUS$2010/PJ,203 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 heat,all-week,late-afternoon,all-year,12.70910000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 +electricity,all-week,night,all-year,26.18290000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.97240000000,R1,0,MUS$2010/PJ,2040 +CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 +electricity,all-week,morning,all-year,26.18290000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.97240000000,R1,1,MUS$2010/PJ,2040 +CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 +electricity,all-week,mid-afternoon,all-year,26.18290000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.97240000000,R1,2,MUS$2010/PJ,2040 +CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 +electricity,all-week,early-peak,all-year,26.18290000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.97240000000,R1,3,MUS$2010/PJ,2040 +CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 +electricity,all-week,late-peak,all-year,26.18290000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.97240000000,R1,4,MUS$2010/PJ,2040 +CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 +electricity,all-week,evening,all-year,26.18290000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.97240000000,R1,5,MUS$2010/PJ,2040 +CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 +electricity,all-week,early-morning,all-year,26.18290000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.97240000000,R1,6,MUS$2010/PJ,2040 +CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 +electricity,all-week,late-afternoon,all-year,26.18290000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.97240000000,R1,7,MUS$2010/PJ,2040 +CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 63229b23f..2a91c624e 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -47,3 +47,14 @@ A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045 A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050 +A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050 +A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050 +A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index ea92faa3c..811f907ed 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -143,3 +143,27 @@ electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 heat,all-week,evening,all-year,9.46670000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 +electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050 +CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 +electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.68810000000,R1,1,MUS$2010/PJ,2050 +CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 +electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050 +CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 +electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.68810000000,R1,3,MUS$2010/PJ,2050 +CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 +electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050 +CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 +electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050 +CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 From b8a470055b857bb736a2f033a4448eab18a65157 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 13:11:01 +0000 Subject: [PATCH 12/22] Add kwargs arguments to prevent complaints --- docs/advanced-guide/extending-muse.ipynb | 2 ++ src/muse/outputs/sector.py | 1 + 2 files changed, 3 insertions(+) diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index 27048ba2c..9acc79251 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/docs/advanced-guide/extending-muse.ipynb @@ -100,6 +100,7 @@ "def consumption_zero(\n", " market: Dataset,\n", " capacity: DataArray,\n", + " **kwargs,\n", "):\n", " \"\"\"Current consumption.\"\"\"\n", " result = (\n", @@ -457,6 +458,7 @@ " sum_over: Optional[list[str]] = None,\n", " drop: Optional[list[str]] = None,\n", " rounding: int = 4,\n", + " **kwargs,\n", "):\n", " \"\"\"Current consumption.\"\"\"\n", " result = (\n", diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py index 312fada94..28e70fc0e 100644 --- a/src/muse/outputs/sector.py +++ b/src/muse/outputs/sector.py @@ -144,6 +144,7 @@ def capacity( market: xr.Dataset, capacity: xr.DataArray, rounding: int = 4, + **kwargs, ) -> pd.DataFrame: """Current capacity.""" result = capacity.to_dataframe().round(rounding) From d5689eaabc56494e11403776df947669e3e07473 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 13:48:14 +0000 Subject: [PATCH 13/22] Add more kwargs arguments --- docs/advanced-guide/extending-muse.ipynb | 7 +++++++ src/muse/outputs/cache.py | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/docs/advanced-guide/extending-muse.ipynb b/docs/advanced-guide/extending-muse.ipynb index 9acc79251..5734aadcc 100644 --- a/docs/advanced-guide/extending-muse.ipynb +++ b/docs/advanced-guide/extending-muse.ipynb @@ -301,6 +301,7 @@ "def capacity(\n", " cached: list[xr.DataArray],\n", " agents: MutableMapping[str, MutableMapping[str, str]],\n", + " **kwargs,\n", ") -> pd.DataFrame:\n", " \"\"\"Consolidates the cached capacity into a single DataFrame to save.\n", "\n", @@ -308,6 +309,7 @@ " cached (list[xr.DataArray]): The list of cached arrays during the calculation of\n", " the time period with the capacity.\n", " agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata.\n", + " kwargs: unused.\n", "\n", " Returns:\n", " pd.DataFrame: DataFrame with the consolidated data for retro agents.\n", @@ -654,6 +656,11 @@ "source": [ "In the next section we will output a technology filter, to stop agents from investing in a certain technology, and a new metric to combine multiple objectives." ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [] } ], "metadata": { diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py index 71712cd95..12fb1ab69 100644 --- a/src/muse/outputs/cache.py +++ b/src/muse/outputs/cache.py @@ -439,12 +439,14 @@ def consolidate_quantity( def capacity( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached capacities into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. @@ -456,12 +458,14 @@ def capacity( def production( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached production into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. @@ -473,12 +477,14 @@ def production( def lcoe( cached: list[xr.DataArray], agents: MutableMapping[str, MutableMapping[str, str]], + **kwargs, ) -> pd.DataFrame: """Consolidates the cached LCOE into a single DataFrame to save. Args: cached (List[xr.DataArray]): The list of cached arrays agents (MutableMapping[Text, MutableMapping[Text, Text]]): Agents' metadata. + kwargs: unused. Returns: pd.DataFrame: DataFrame with the consolidated data. From caf4d2988f1a0b0bbd9622bd886a58cc6d447c00 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 14:41:22 +0000 Subject: [PATCH 14/22] Update trade result --- src/muse/outputs/cache.py | 2 +- .../trade/Results/MCAPrices.csv | 38 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py index 12fb1ab69..5f77aa706 100644 --- a/src/muse/outputs/cache.py +++ b/src/muse/outputs/cache.py @@ -354,7 +354,7 @@ def extract_agents_internal( info[aid]["category"] = agent.category info[aid]["sector"] = sector_name info[aid]["dst_region"] = agent.region - info[aid]["year"] = agent.forecast_year + info[aid]["year"] = agent.year info[aid]["installed"] = agent.year return info diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index 5f44b6145..b09131a22 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -88,40 +88,40 @@ electricity,all-week,evening,all-year,31.00090000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,20.52280000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,60.96730000000,R2,5,MUS$2010/PJ,2030 heat,all-week,evening,all-year,18.24100000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,192.11860000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,52.15770000000,R2,5,MUS$2010/PJ,2030 electricity,all-week,night,all-year,41.37870000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,363.84600000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,213.38810000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,26.31110000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,209.37450000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,109.06920000000,R2,0,MUS$2010/PJ,2035 heat,all-week,night,all-year,22.07810000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,193.44360000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,97.02350000000,R2,0,MUS$2010/PJ,2035 electricity,all-week,morning,all-year,41.37870000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,363.84600000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,213.38810000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,26.31110000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,209.37450000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,109.06920000000,R2,1,MUS$2010/PJ,2035 heat,all-week,morning,all-year,22.07810000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,193.44360000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,97.02350000000,R2,1,MUS$2010/PJ,2035 electricity,all-week,afternoon,all-year,41.37870000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,363.84600000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,213.38810000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,26.31110000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,209.37450000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,109.06920000000,R2,2,MUS$2010/PJ,2035 heat,all-week,afternoon,all-year,22.07810000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,193.44360000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,97.02350000000,R2,2,MUS$2010/PJ,2035 electricity,all-week,early-peak,all-year,41.37870000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,363.84600000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,213.38810000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,26.31110000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,209.37450000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,109.06920000000,R2,3,MUS$2010/PJ,2035 heat,all-week,early-peak,all-year,22.07810000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,193.44360000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,97.02350000000,R2,3,MUS$2010/PJ,2035 electricity,all-week,late-peak,all-year,41.37870000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,363.84600000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,213.38810000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,26.31110000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,209.37450000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,109.06920000000,R2,4,MUS$2010/PJ,2035 heat,all-week,late-peak,all-year,22.07810000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,193.44360000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,97.02350000000,R2,4,MUS$2010/PJ,2035 electricity,all-week,evening,all-year,41.37870000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,363.84600000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,213.38810000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,26.31110000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,209.37450000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,109.06920000000,R2,5,MUS$2010/PJ,2035 heat,all-week,evening,all-year,22.07810000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,193.44360000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,97.02350000000,R2,5,MUS$2010/PJ,2035 From f48b6d02bf3e1972a13f44a5b95d0fd17ce9d156 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 23 Jan 2025 15:21:51 +0000 Subject: [PATCH 15/22] Remove more forecast features --- src/muse/agents/agent.py | 10 ---------- src/muse/sectors/sector.py | 9 --------- src/muse/sectors/subsector.py | 5 ----- 3 files changed, 24 deletions(-) diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py index d02f074e3..eddc6600e 100644 --- a/src/muse/agents/agent.py +++ b/src/muse/agents/agent.py @@ -113,7 +113,6 @@ def __init__( decision: Callable | None = None, year: int = 2010, maturity_threshold: float = 0, - forecast: int = 5, housekeeping: Callable | None = None, merge_transform: Callable | None = None, demand_threshold: float | None = None, @@ -137,7 +136,6 @@ def __init__( year: year the agent is created / current year maturity_threshold: threshold when filtering replacement technologies with respect to market share - forecast: Number of years the agent will forecast housekeeping: transform applied to the assets at the start of iteration. Defaults to doing nothing. merge_transform: transform merging current and newly invested assets @@ -170,9 +168,6 @@ def __init__( """ Current year. Incremented by one every time next is called.""" self.year = year - """Number of years to look into the future for forecating purposed.""" - self.forecast = forecast - """Search rule(s) determining potential replacement technologies. This is a string referring to a filter, or a sequence of strings @@ -234,11 +229,6 @@ def __init__( """Threshold below which assets are not added.""" self.asset_threshold = asset_threshold - @property - def forecast_year(self): - """Year to consider when forecasting.""" - return self.year + self.forecast - def asset_housekeeping(self): """Reduces memory footprint of assets. diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index e7e4dee6d..00d2532a1 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -169,15 +169,6 @@ def __init__( """Full supply, consumption and costs data for the most recent year.""" self.output_data: xr.Dataset - @property - def forecast(self): - """Maximum forecast horizon across agents. - - It cannot be lower than 1 year. - """ - forecasts = [getattr(agent, "forecast") for agent in self.agents] - return max(1, max(forecasts)) - def next( self, mca_market: xr.Dataset, diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py index 8e552a0a3..b6dab6c9c 100644 --- a/src/muse/sectors/subsector.py +++ b/src/muse/sectors/subsector.py @@ -24,7 +24,6 @@ def __init__( constraints: Callable | None = None, investment: Callable | None = None, name: str = "subsector", - forecast: int = 5, expand_market_prices: bool = False, timeslice_level: str | None = None, ): @@ -37,7 +36,6 @@ def __init__( self.demand_share = demand_share or ds.factory() self.constraints = constraints or cs.factory() self.investment = investment or iv.factory() - self.forecast = forecast self.name = name self.expand_market_prices = expand_market_prices self.timeslice_level = timeslice_level @@ -142,7 +140,6 @@ def factory( asset_threshold=getattr(settings, "asset_threshold", 1e-12), # only used by self-investing agents investment=getattr(settings, "lpsolver", "scipy"), - forecast=getattr(settings, "forecast", 5), constraints=getattr(settings, "constraints", ()), timeslice_level=timeslice_level, ) @@ -181,7 +178,6 @@ def factory( constraints = cs.factory(getattr(settings, "constraints", None)) # only used by non-self-investing agents investment = iv.factory(getattr(settings, "lpsolver", "scipy")) - forecast = getattr(settings, "forecast", 5) expand_market_prices = getattr(settings, "expand_market_prices", None) if expand_market_prices is None: @@ -195,7 +191,6 @@ def factory( demand_share=demand_share, constraints=constraints, investment=investment, - forecast=forecast, name=name, expand_market_prices=expand_market_prices, timeslice_level=timeslice_level, From 778aa2577c013e2363e37e7ec301abf791e902b4 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 27 Jan 2025 13:55:15 +0000 Subject: [PATCH 16/22] Change docstring --- src/muse/carbon_budget.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/muse/carbon_budget.py b/src/muse/carbon_budget.py index a0d578a5a..313353581 100644 --- a/src/muse/carbon_budget.py +++ b/src/muse/carbon_budget.py @@ -334,7 +334,7 @@ def bisection( # Create cache for emissions at different price points emissions_cache = EmissionsCache(market, equilibrium, commodities) - # Carbon price and emissions threshold in the forecast year + # Carbon price and emissions threshold in the investment year future = market.year[-1] target = carbon_budget.sel(year=future).values.item() price = market.prices.sel(year=future, commodity=commodities).mean().values.item() From 01796ced9338e7325ec66478e24aff7707b20011 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 27 Jan 2025 14:41:22 +0000 Subject: [PATCH 17/22] Remove forecast settings --- docs/inputs/toml.rst | 1 - .../add-agent/1-single-objective/settings.toml | 1 - .../add-agent/2-multiple-objective/settings.toml | 1 - .../add-correlation-demand/1-correlation/settings.toml | 1 - .../add-new-technology/1-introduction/settings.toml | 1 - .../add-new-technology/2-scenario/settings.toml | 1 - docs/tutorial-code/add-region/1-new-region/settings.toml | 1 - .../add-service-demand/1-exogenous-demand/settings.toml | 1 - .../carbon-budget/1-carbon-budget/settings.toml | 1 - .../1-min-constraint/settings.toml | 1 - .../2-max-constraint/settings.toml | 1 - .../modify-timing-data/1-modify-timeslices/settings.toml | 1 - .../2-modify-time-framework/settings.toml | 3 --- docs/tutorial-code/modify-timing-data/generate_models.py | 7 +------ docs/tutorial-code/new-decision-metric/settings.toml | 1 - src/muse/data/example/default/settings.toml | 1 - src/muse/data/example/default_retro/settings.toml | 1 - src/muse/data/example/default_timeslice/settings.toml | 1 - src/muse/data/example/minimum_service/settings.toml | 1 - src/muse/data/example/trade/settings.toml | 3 --- 20 files changed, 1 insertion(+), 29 deletions(-) diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index a72d29c09..23aa9f692 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -577,7 +577,6 @@ function of macro-economic data, i.e. population and gdp. macrodrivers_path = '{path}/technodata/Macrodrivers.csv' regression_path = '{path}/technodata/regressionparameters.csv' timeslices_levels = {'day': ['all-day']} - forecast = [0, 5] The following attributes are accepted: 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 f1324fdd7..54fa58505 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/settings.toml +++ b/docs/tutorial-code/add-agent/1-single-objective/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 f1324fdd7..54fa58505 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml +++ b/docs/tutorial-code/add-agent/2-multiple-objective/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 cc21586fa..ab6609bda 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 5350c198b..b4fd25519 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/settings.toml +++ b/docs/tutorial-code/add-new-technology/1-introduction/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 5350c198b..b4fd25519 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/settings.toml +++ b/docs/tutorial-code/add-new-technology/2-scenario/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 edcf9888a..02e69b641 100644 --- a/docs/tutorial-code/add-region/1-new-region/settings.toml +++ b/docs/tutorial-code/add-region/1-new-region/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 f1324fdd7..54fa58505 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 @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 0ea705c9d..14c898b90 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/settings.toml @@ -64,7 +64,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 ba89aa072..f87bc8366 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 @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 ba89aa072..f87bc8366 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 @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 a0618f0e4..ffcde735c 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 @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' 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 0c426b50d..71bbc5523 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 @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 2 # Optional, defaults to 5 [sectors.power] type = 'default' @@ -66,7 +65,6 @@ agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/power/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -forecast = 2 [sectors.gas] type = 'default' @@ -81,7 +79,6 @@ agents = '{path}/technodata/Agents.csv' existing_capacity = '{path}/technodata/gas/ExistingCapacity.csv' lpsolver = "scipy" demand_share = "standard_demand" -forecast = 2 [sectors.residential_presets] type = 'presets' diff --git a/docs/tutorial-code/modify-timing-data/generate_models.py b/docs/tutorial-code/modify-timing-data/generate_models.py index 5da0d313d..172735c9b 100644 --- a/docs/tutorial-code/modify-timing-data/generate_models.py +++ b/docs/tutorial-code/modify-timing-data/generate_models.py @@ -6,7 +6,7 @@ from tomlkit import dumps, parse from muse import examples -from muse.wizard import add_timeslice, get_sectors, modify_toml +from muse.wizard import add_timeslice, modify_toml parent_path = Path(__file__).parent @@ -80,11 +80,6 @@ def generate_model_2(): settings_file = model_path / "settings.toml" time_framework = [2020, 2022, 2024, 2026, 2028, 2030, 2032, 2034, 2036, 2038, 2040] modify_toml(settings_file, lambda x: x.update({"time_framework": time_framework})) - for sector in get_sectors(model_path): - modify_toml( - settings_file, - lambda x: x["sectors"][sector]["subsectors"]["all"].update({"forecast": 2}), - ) if __name__ == "__main__": diff --git a/docs/tutorial-code/new-decision-metric/settings.toml b/docs/tutorial-code/new-decision-metric/settings.toml index 38031f5c6..05c316389 100644 --- a/docs/tutorial-code/new-decision-metric/settings.toml +++ b/docs/tutorial-code/new-decision-metric/settings.toml @@ -49,7 +49,6 @@ constraints = [ "search_space" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' diff --git a/src/muse/data/example/default/settings.toml b/src/muse/data/example/default/settings.toml index f1324fdd7..54fa58505 100644 --- a/src/muse/data/example/default/settings.toml +++ b/src/muse/data/example/default/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' diff --git a/src/muse/data/example/default_retro/settings.toml b/src/muse/data/example/default_retro/settings.toml index 3790378e4..23eb00a41 100644 --- a/src/muse/data/example/default_retro/settings.toml +++ b/src/muse/data/example/default_retro/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "new_and_retro" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [[sectors.residential.interactions]] net = 'new_to_retro' diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml index ba89aa072..f87bc8366 100644 --- a/src/muse/data/example/default_timeslice/settings.toml +++ b/src/muse/data/example/default_timeslice/settings.toml @@ -51,7 +51,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.power] type = 'default' diff --git a/src/muse/data/example/minimum_service/settings.toml b/src/muse/data/example/minimum_service/settings.toml index eec949de7..0f0cc7183 100644 --- a/src/muse/data/example/minimum_service/settings.toml +++ b/src/muse/data/example/minimum_service/settings.toml @@ -56,7 +56,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "standard_demand" # Optional, default to standard_demand -forecast = 5 # Optional, defaults to 5 [sectors.industry_presets] type = 'presets' diff --git a/src/muse/data/example/trade/settings.toml b/src/muse/data/example/trade/settings.toml index 17a00af59..a812ea926 100644 --- a/src/muse/data/example/trade/settings.toml +++ b/src/muse/data/example/trade/settings.toml @@ -58,7 +58,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "new_and_retro" -forecast = 5 asset_threshold = 1e-4 [[sectors.residential.interactions]] @@ -90,7 +89,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "unmet_forecasted_demand" -forecast = 5 asset_threshold = 1e-4 [sectors.gas] @@ -118,7 +116,6 @@ constraints = [ "demand_limiting_capacity" ] demand_share = "unmet_forecasted_demand" -forecast = 5 asset_threshold = 1e-4 [timeslices] From 62db2778b0de9c0a0bb64941be54f865d8c2864f Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 27 Jan 2025 14:48:52 +0000 Subject: [PATCH 18/22] Simplify _interpolate --- src/muse/sectors/preset_sector.py | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py index 03bf20080..361105b81 100644 --- a/src/muse/sectors/preset_sector.py +++ b/src/muse/sectors/preset_sector.py @@ -143,29 +143,9 @@ def next(self, mca_market: Dataset) -> Dataset: consumption = self._interpolate(presets.consumption, mca_market.year) costs = self._interpolate(presets.costs, mca_market.year) - result = Dataset({"supply": supply, "consumption": consumption}) - result["costs"] = drop_timeslice(costs) + result = Dataset({"supply": supply, "consumption": consumption, "costs": costs}) assert isinstance(result, Dataset) return result def _interpolate(self, data: DataArray, years: DataArray) -> DataArray: - """Chooses interpolation depending on whether forecast is available.""" - if "forecast" in data.dims: - baseyear = int(years.min()) - forecasted = (years - baseyear).values - result = ( - data.interp( - year=baseyear, - method=self.interpolation_mode, - kwargs={"fill_value": "extrapolate"}, - ) - .interp( - forecast=forecasted, - method=self.interpolation_mode, - kwargs={"fill_value": "extrapolate"}, - ) - .drop_vars(("year", "forecast")) - ) - result["year"] = "forecast", years.values - return result.set_index(forecast="year").rename(forecast="year") return data.interp(year=years, method=self.interpolation_mode).ffill("year") From b5d1a2bc24cc8048db8ee8e74c4e50b95368d544 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Mon, 27 Jan 2025 15:36:17 +0000 Subject: [PATCH 19/22] Update docs --- docs/application-flow.rst | 6 +++--- docs/inputs/toml.rst | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/application-flow.rst b/docs/application-flow.rst index f25c24645..883b7c5a4 100644 --- a/docs/application-flow.rst +++ b/docs/application-flow.rst @@ -414,7 +414,7 @@ This deeper level of the process is where most of the input options of MUSE are Investment ~~~~~~~~~~ -In the investment step is where new capacity is added to the different assets managed by the agents. This investment might be needed to cover an increase in demand (between now and forecast) or to match decommissioned assets, typically to do both. +In the investment step is where new capacity is added to the different assets managed by the agents. This investment might be needed to cover an increase in demand (between now and the investment year) or to match decommissioned assets, typically to do both. The following graph summarises the process. @@ -455,8 +455,8 @@ The following graph summarises the process. First the demand is distributed among the available agents as requested by the ``demand_share`` argument of each ``subsector`` in the ``settings.toml`` file. This distribution can be done based on any attribute or property of the agents, as included in the ``Agents.csv`` file. Demand can also be shared across multiple agents, depending on the "quantity" attribute (defined in ``Agents.csv``). The two built-in options in MUSE are: -- `standard_demand` (default): The demand is split only amongst *new* agents (indeed there will be an error if a *retro* agent is found for this subsector). *New* agents get a share of the increase in demand for the forecast years well as the demand that occurs from decommissioned assets. -- `new_and_retro`: The input demand is split amongst both *new* and *retro* agents. *New* agents get a share of the increase in demand for the forecast year, whereas *retrofit* agents are assigned a share of the demand that occurs from decommissioned assets. +- `standard_demand` (default): The demand is split only amongst *new* agents (indeed there will be an error if a *retro* agent is found for this subsector). *New* agents get a share of the increase in demand over the investment period as well as the demand that occurs from decommissioned assets. +- `new_and_retro`: The input demand is split amongst both *new* and *retro* agents. *New* agents get a share of the increase in demand for the investment period, whereas *retrofit* agents are assigned a share of the demand that occurs from decommissioned assets. Then, each agent select the technologies it can invest in based on what is needed and the **search rules** defined for it in the ``Agents.csv`` file. The possible search rules are described in :py:mod:`muse.filters`. These determine the search rules for each replacement technology. diff --git a/docs/inputs/toml.rst b/docs/inputs/toml.rst index 23aa9f692..72d60f090 100644 --- a/docs/inputs/toml.rst +++ b/docs/inputs/toml.rst @@ -455,11 +455,11 @@ Sectors contain a number of subsections: - :py:func:`~muse.demand_share.standard_demand` (default): The input demand is split amongst *new* agents. *New* agents get a share of the increase in demand - for the forecast years, as well as the demand that occurs from decommissioned + over the investment period, as well as the demand that occurs from decommissioned assets. - :py:func:`~muse.demand_share.new_and_retro`: The input demand is split amongst both *new* and *retrofit* agents. *New* agents get a share of the increase in - demand for the forecast year, whereas *retrofit* agents are assigned a share + demand over the investment period, whereas *retrofit* agents are assigned a share of the demand that occurs from decommissioned assets. *constraints* From 463b4839f8c5f652a4d011965bac77006b809abf Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 4 Feb 2025 19:13:02 +0000 Subject: [PATCH 20/22] Remove remaining references --- docs/user-guide/modify-timing-data.ipynb | 15 --------------- src/muse/readers/toml.py | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/docs/user-guide/modify-timing-data.ipynb b/docs/user-guide/modify-timing-data.ipynb index 100bfdeff..6c619a10e 100644 --- a/docs/user-guide/modify-timing-data.ipynb +++ b/docs/user-guide/modify-timing-data.ipynb @@ -149,21 +149,6 @@ "```" ] }, - { - "cell_type": "markdown", - "metadata": {}, - "source": [ - "We also have to modity the `forecast` value for each sector. For example, for the power sector the `sectors.power.subsectors.all` section should now look as follows:\n", - "\n", - "```toml\n", - "[sectors.power.subsectors.all]\n", - "agents = '{path}/technodata/Agents.csv'\n", - "existing_capacity = '{path}/technodata/power/ExistingCapacity.csv'\n", - "lpsolver = \"scipy\"\n", - "forecast = 2\n", - "```" - ] - }, { "cell_type": "markdown", "metadata": {}, diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py index 2c237fd06..2f88e892f 100644 --- a/src/muse/readers/toml.py +++ b/src/muse/readers/toml.py @@ -737,7 +737,7 @@ def read_technodata( technologies[name] = data # make sure technologies includes the requisite years - maxyear = getattr(settings, "forecast", 5) + max(time_framework) + maxyear = max(time_framework) if technologies.year.max() < maxyear: msg = "Forward-filling technodata to fit simulation timeframe" getLogger(__name__).info(msg) From 97929b6c46aa3fbcb999bd6ed3e742d89f796afa Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Tue, 4 Feb 2025 19:21:02 +0000 Subject: [PATCH 21/22] Warning about deprecated parameter --- src/muse/sectors/subsector.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py index b6dab6c9c..266e54a77 100644 --- a/src/muse/sectors/subsector.py +++ b/src/muse/sectors/subsector.py @@ -131,6 +131,14 @@ def factory( ) getLogger(__name__).warning(msg) + # Raise warning if deprecated forecast parameter is used (PR #645) + if hasattr(settings, "forecast"): + msg = ( + "The 'forecast' parameter has been deprecated. " + "Please remove from your settings file." + ) + getLogger(__name__).warning(msg) + agents = agents_factory( settings.agents, settings.existing_capacity, From 5f48857bbb6328ae7c1d97a0c86c6e05b7015a22 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 6 Feb 2025 15:22:11 +0000 Subject: [PATCH 22/22] Tidy run function --- src/muse/mca.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index 0683c99be..6c029e167 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -279,11 +279,13 @@ def run(self) -> None: variables = ["supply", "consumption", "prices"] for year_idx in range(nyear): - years = self.time_framework[year_idx : year_idx + 2] + current_year, investment_year = self.time_framework[year_idx : year_idx + 2] getLogger(__name__).info( - f"Running simulation years {years[0]} to {years[1]}" + f"Running simulation years {current_year} to {investment_year}" + ) + new_market = self.market[variables].sel( + year=[current_year, investment_year] ) - new_market = self.market[variables].sel(year=years) assert isinstance(new_market, Dataset) new_market.supply[:] = 0 new_market.consumption[:] = 0 @@ -291,7 +293,7 @@ def run(self) -> None: # If we need to account for the carbon budget, we do it now. if check_carbon_budget: new_price = self.update_carbon_price(new_market) - future_price = DataArray(new_price, coords=dict(year=years[1])) + 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), @@ -303,12 +305,13 @@ def run(self) -> None: # Solve the market _, new_market, self.sectors = self.find_equilibrium(new_market) - # Save sector outputs + # Save sector outputs for the investment year + # In the first iteration we also save outputs for the first year for sector in self.sectors: if type(sector) is Sector: if year_idx == 0: - sector.save_outputs(years[0]) - sector.save_outputs(years[1]) + sector.save_outputs(current_year) + sector.save_outputs(investment_year) # If we need to account for the carbon budget, we might need to change # the budget for the future, too. @@ -323,21 +326,20 @@ def run(self) -> None: self.market.consumption.loc[dims] = new_market.consumption dims = {i: new_market[i] for i in new_market.prices.dims if i != "year"} self.market.prices.loc[dims] = future_propagation( - self.market.prices.sel(dims), new_market.prices.sel(year=years[1]) + self.market.prices.sel(dims), + new_market.prices.sel(year=investment_year), ) + # Global outputs for the investment year + # In the first iteration we also save outputs for the first year if year_idx == 0: - # Necessary to get global outputs for the first year of the framework - self.outputs(self.market, self.sectors, year=years[0]) - - # Global outputs - investment_year = years[1] + self.outputs(self.market, self.sectors, year=current_year) self.outputs(self.market, self.sectors, year=investment_year) - self.outputs_cache.consolidate_cache(year=years[0]) + self.outputs_cache.consolidate_cache(year=current_year) # TODO: change cache to investment_year (not working properly anyway) getLogger(__name__).info( - f"Finished simulation period {years[0]} to {years[1]} " + f"Finished simulation period {current_year} to {investment_year} " f"({year_idx + 1}/{nyear})!" )