From 8d35e650fff1d0376bb8ab9a6594194b20ce5042 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 23 Apr 2026 17:10:05 +0100 Subject: [PATCH 1/8] Return endogenous prices in the first year --- src/muse/mca.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/muse/mca.py b/src/muse/mca.py index badaeb3ca..6f2a9b01f 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -332,6 +332,10 @@ def run(self) -> None: # Update prices dims = {i: new_market[i] for i in new_market.prices.dims if i != "year"} + if year_idx == 0: + self.market.prices.loc[{**dims, "year": current_year}] = ( + new_market.prices.sel(year=current_year) + ) self.market.prices.loc[dims] = future_propagation( self.market.prices.sel(dims), new_market.prices.sel(year=investment_year), @@ -378,10 +382,7 @@ def single_year_iteration( sectors = deepcopy(sectors) market = market.copy(deep=True) - - # New prices for the investment year - investment_year = market.year[1] - updated_prices = market.prices.sel(year=investment_year) + updated_prices = market.prices.copy(deep=True) for sector in sectors: # Solve the sector @@ -399,11 +400,9 @@ def single_year_iteration( # Update market prices # We only do this for the commodities that the sector is in charge of producing # And only for regions/timeslices with >0 production in the investment year - supply = sector_market.supply.sel(year=investment_year) + supply = sector_market.supply supply = supply.where(supply.commodity.isin(sector.commodities), 0) - updated_prices = updated_prices.where( - supply == 0, sector_market.costs.sel(year=investment_year) - ) + updated_prices = updated_prices.where(supply == 0, sector_market.costs) return SingleYearIterationResult(market, sectors, updated_prices) @@ -473,7 +472,7 @@ def find_equilibrium( break # Update prices - market["prices"].loc[dict(year=investment_year)] = updated_prices + market["prices"].loc[:] = updated_prices # Check convergence converged = check_equilibrium( From 719deb9ce1103c56a3ed2713f5e0768e816bddce Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 23 Apr 2026 18:14:24 +0100 Subject: [PATCH 2/8] Fix bug in run_models.py --- tests/example_outputs/run_models.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tests/example_outputs/run_models.py b/tests/example_outputs/run_models.py index 3583be9e9..9fad7adab 100644 --- a/tests/example_outputs/run_models.py +++ b/tests/example_outputs/run_models.py @@ -6,6 +6,8 @@ from muse.examples import AVAILABLE_EXAMPLES, model +parent_path = Path(__file__).parent + def run_model(name: str) -> Union[str, None]: """Run a model with the specified settings file. @@ -16,20 +18,23 @@ def run_model(name: str) -> Union[str, None]: Returns: Error message for failed runs, otherwise None. """ + prev_cwd = Path.cwd() + run_dir = parent_path / name try: # Prepare results folder - folder_path = Path(name) - if folder_path.exists(): - shutil.rmtree(folder_path) - folder_path.mkdir() + if run_dir.exists(): + shutil.rmtree(run_dir) + run_dir.mkdir() # Run model - os.chdir(folder_path) + os.chdir(run_dir) m = model(name) m.run() return None except Exception as e: return f"Failed to run model {name}. Error: {e}" + finally: + os.chdir(prev_cwd) if __name__ == "__main__": From c882c38b3fbe6b5bbbc9b837df48cbf2d10f6b8c Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 23 Apr 2026 18:14:33 +0100 Subject: [PATCH 3/8] Update results files --- .../1-single-objective/Results/MCAPrices.csv | 24 +++++----- .../Results/MCAPrices.csv | 24 +++++----- .../1-correlation/Results/MCAPrices.csv | 24 +++++----- .../1-introduction/Results/MCAPrices.csv | 24 +++++----- .../2-scenario/Results/MCAPrices.csv | 24 +++++----- .../1-new-region/Results/MCAPrices.csv | 48 +++++++++---------- .../Results/MCAPrices.csv | 36 +++++++------- .../2-agents/Results/MCAPrices.csv | 36 +++++++------- .../1-exogenous-demand/Results/MCAPrices.csv | 36 +++++++------- .../1-carbon-budget/Results/MCAPrices.csv | 24 +++++----- .../1-min-constraint/Results/MCAPrices.csv | 36 +++++++------- .../2-max-constraint/Results/MCAPrices.csv | 32 ++++++------- .../1-modify-timeslices/Results/MCAPrices.csv | 32 ++++++------- .../Results/MCAPrices.csv | 32 ++++++------- .../new-decision-metric/Results/MCAPrices.csv | 24 +++++----- .../default/Results/MCAPrices.csv | 24 +++++----- .../default_adhoc/Results/MCAPrices.csv | 24 +++++----- .../default_correlation/Results/MCAPrices.csv | 24 +++++----- .../default_retro/Results/MCAPrices.csv | 24 +++++----- .../default_timeslice/Results/MCAPrices.csv | 24 +++++----- .../Results/Power_Supply.csv | 12 ++--- .../medium/Results/MCAPrices.csv | 36 +++++++------- .../minimum_service/Results/MCAPrices.csv | 6 +-- .../multiple_agents/Results/MCAPrices.csv | 24 +++++----- .../trade/Results/MCAPrices.csv | 24 +++++----- 25 files changed, 339 insertions(+), 339 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index c935d740f..0fcadea01 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 7283f612d..8dc0e762d 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.7496,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 5ad9b6d82..358f0f784 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1996,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index 6081d7753..2928ae6dd 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,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index bd5326093..61ec07d37 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,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 44ca78544..176ec59b4 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,62 +1,62 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.5000,r2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv index 88431f045..0341f2457 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv @@ -1,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv index 9fb811274..172678d0f 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv @@ -1,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index 88431f045..0341f2457 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,40 +1,40 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4724,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index bbd999e3f..4b7c24199 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,25.4255,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,25.4255,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,25.4255,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,25.4255,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,25.4255,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,25.4255,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,24.3529,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index 9af633cd5..d2d5cc55b 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,19.0270,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,19.0270,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,19.0270,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,19.0270,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,19.0270,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,19.0270,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,11.0936,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 95df32cd7..5059ff34d 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,21.0041,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,21.0041,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,21.0041,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,21.0041,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,11.4949,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 2742e1a6b..5c89f6ecd 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,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.7988,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.7988,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,11.7988,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.7988,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.7988,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.7988,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.1528,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,11.7988,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,11.7988,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.0108,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 4526361d9..0da42cfdf 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,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,10.3650,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,10.3650,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,mid-afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,10.3650,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,10.3650,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,10.3650,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,10.3650,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 -gas,all-week,early-morning,all-year,7.1528,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 +gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,10.3650,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 -gas,all-week,late-afternoon,all-year,7.1528,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 +gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,10.3650,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,26.3034,r1,0,MUS$2010/PJ,2022 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 21e5ad055..1a1d1219d 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,100.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,100.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,100.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,100.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,100.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,100.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index d916135e5..f129e0464 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 043aeb0a8..7ffbf50fe 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.6509,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_correlation/Results/MCAPrices.csv b/tests/example_outputs/default_correlation/Results/MCAPrices.csv index 5ad9b6d82..358f0f784 100644 --- a/tests/example_outputs/default_correlation/Results/MCAPrices.csv +++ b/tests/example_outputs/default_correlation/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1996,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 8e29dcff8..4f3f3ea96 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index fbd097082..23f077b04 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,11.3165,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index bf3eb5d9a..850afe456 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,22 +1,22 @@ asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 0,electricity,all-week,night,2020,all-year,r1,0.0556,gasCCGT,0,MUS$2010/PJ,2025 1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 +0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 0,electricity,all-week,morning,2020,all-year,r1,0.0833,gasCCGT,1,MUS$2010/PJ,2025 1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 +0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 0,electricity,all-week,afternoon,2020,all-year,r1,0.0556,gasCCGT,2,MUS$2010/PJ,2025 1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 +0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 0,electricity,all-week,early-peak,2020,all-year,r1,0.0833,gasCCGT,3,MUS$2010/PJ,2025 1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 +0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,MUS$2010/PJ,2025 1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 +0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 0,electricity,all-week,evening,2020,all-year,r1,0.1111,gasCCGT,5,MUS$2010/PJ,2025 1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2025 +0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2030 2,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2030 1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 0b4eb059c..9b1fe4261 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -1,38 +1,38 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/GWh,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 -cook,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8475,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/GWh,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 -cook,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8475,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/GWh,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 -cook,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8475,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/GWh,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 -cook,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8475,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/GWh,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 -cook,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8475,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/GWh,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 -cook,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8475,r1,5,MUS$2010/PJ,2020 +cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,28.3773,r1,0,MUS$2010/GWh,2025 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 5df6205d7..765b08e4f 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -2,7 +2,7 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year fuel1,all-week,all-day,winter,1.0000,r1,0,MUS$2010/PJ,2010 fuel2,all-week,all-day,winter,9.5512,r1,0,MUS$2010/PJ,2010 fuel3,all-week,all-day,winter,0.0533,r1,0,MUS$2010/PJ,2010 -ammonia,all-week,all-day,winter,0.0000,r1,0,MUS$2010/Mt,2010 +ammonia,all-week,all-day,winter,397.8624,r1,0,MUS$2010/Mt,2010 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 @@ -11,7 +11,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 fuel1,all-week,all-day,summer,1.0000,r1,1,MUS$2010/PJ,2010 fuel2,all-week,all-day,summer,9.5512,r1,1,MUS$2010/PJ,2010 fuel3,all-week,all-day,summer,0.0533,r1,1,MUS$2010/PJ,2010 -ammonia,all-week,all-day,summer,0.0000,r1,1,MUS$2010/Mt,2010 +ammonia,all-week,all-day,summer,397.8624,r1,1,MUS$2010/Mt,2010 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 @@ -20,7 +20,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 fuel1,all-week,all-day,spring-autumn,1.0000,r1,2,MUS$2010/PJ,2010 fuel2,all-week,all-day,spring-autumn,9.5512,r1,2,MUS$2010/PJ,2010 fuel3,all-week,all-day,spring-autumn,0.0533,r1,2,MUS$2010/PJ,2010 -ammonia,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/Mt,2010 +ammonia,all-week,all-day,spring-autumn,397.8624,r1,2,MUS$2010/Mt,2010 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 04bd3a0f7..935dc574f 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,7.1528,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,7.1528,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,7.1528,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,7.1528,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,7.1528,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,7.1528,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,28.3773,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index ffecb4e40..be65f99b6 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,7 +1,7 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,13.9815,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.7168,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,11.2701,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.8176,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.1389,r2,0,MUS$2010/PJ,2020 @@ -10,8 +10,8 @@ heat,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,13.9815,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.7168,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,11.2701,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.8176,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.1389,r2,1,MUS$2010/PJ,2020 @@ -20,8 +20,8 @@ heat,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,13.9815,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.7168,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,11.2701,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.8176,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.1389,r2,2,MUS$2010/PJ,2020 @@ -30,8 +30,8 @@ heat,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,13.9815,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.7168,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,11.2701,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.8176,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.1389,r2,3,MUS$2010/PJ,2020 @@ -40,8 +40,8 @@ heat,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,13.9815,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.7168,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,11.2701,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.8176,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.1389,r2,4,MUS$2010/PJ,2020 @@ -50,8 +50,8 @@ heat,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,13.9815,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.7168,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,11.2701,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.8176,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0000,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.1389,r2,5,MUS$2010/PJ,2020 From f72408186959688ad07340bc96188585a779b2bf Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 24 Apr 2026 14:30:04 +0100 Subject: [PATCH 4/8] Improve documentation Co-authored-by: Copilot --- docs/inputs/projections.rst | 24 ++++++++++++++++-------- src/muse/mca.py | 3 ++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index 919f370dc..f721f3082 100644 --- a/docs/inputs/projections.rst +++ b/docs/inputs/projections.rst @@ -10,19 +10,27 @@ The interpretation of these prices depends on the type of commodity: the monetary cost of purchasing the commodity. Whether a price projection is required or not depends on the processes in the model and the simulation settings: - * For commodities that are **produced by processes in the model**, prices do not need to - be provided as they are calculated endogenously by the model in all years after the - base year, so long as the model is in equilibrium mode. Equilibrium mode is active - as long as the ``maximum_iterations`` parameter in the settings file is greater than 1. - * For commodities that are **not produced by processes in the model**, and are not free, prices should be - provided for all years as they cannot be endogenously calculated. + * For commodities that are **produced by processes in the model**, the behaviour + depends on the similation mode: + * In equilibrium mode (``maximum_iterations > 1``), price projections are **optional**. + If not provided, prices are initialised to zero for all years. + Once the commodity is produced, its price is calculated endogenously for that year + and carried forward to subsequent years until updated again. + Until the first year of production, the price remains at the projected value + (or zero if no projection is provided). + * Outside equilibrium mode (``maximum_iterations = 1``), prices are **not** calculated + endogenously, so projections are required for all years. Any missing values will be + interpreted as zero (i.e. no cost to purchase). + * For commodities that are **not produced by processes in the model**, and are not free, + prices should be provided for all years as they cannot be endogenously calculated. + Lack of a price trajectory will be interpreted as a price of 0 for all periods (i.e. no cost to purchase). * For **environmental** commodities, prices represent levies on production (e.g. carbon tax). In most cases, these will not be calculated endogenously, so users should provide full price trajectories. The exception is when using the carbon budget mode, where the prices of environmental commodities may be updated throughout the simulation. - -Lack of a price trajectory for any commodity will be interpreted as a price of 0 for all periods (i.e. no cost to purchase, and no levy on production), again with the exception of the carbon budget mode. + Lack of a price trajectory will be interpreted as a price of 0 for all periods (i.e. no levy on production), + again with the exception of the carbon budget mode. Price trajectories should be stored in a CSV file with the structure shown in the table below, and referenced from the TOML settings file using the ``projections`` key. diff --git a/src/muse/mca.py b/src/muse/mca.py index 6f2a9b01f..c99dd6095 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -330,7 +330,8 @@ def run(self) -> None: self.market.supply.loc[dims] = new_market.supply self.market.consumption.loc[dims] = new_market.consumption - # Update prices + # Update prices for the investment year + # In the first iteration we also update prices for the first year dims = {i: new_market[i] for i in new_market.prices.dims if i != "year"} if year_idx == 0: self.market.prices.loc[{**dims, "year": current_year}] = ( From a5d69b6af4e889721caa69fe23d791af3eb163aa Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 24 Apr 2026 14:54:52 +0100 Subject: [PATCH 5/8] Fix rst formatting --- docs/inputs/projections.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index f721f3082..ea1abdcdc 100644 --- a/docs/inputs/projections.rst +++ b/docs/inputs/projections.rst @@ -12,15 +12,18 @@ The interpretation of these prices depends on the type of commodity: * For commodities that are **produced by processes in the model**, the behaviour depends on the similation mode: + * In equilibrium mode (``maximum_iterations > 1``), price projections are **optional**. If not provided, prices are initialised to zero for all years. Once the commodity is produced, its price is calculated endogenously for that year and carried forward to subsequent years until updated again. Until the first year of production, the price remains at the projected value (or zero if no projection is provided). + * Outside equilibrium mode (``maximum_iterations = 1``), prices are **not** calculated endogenously, so projections are required for all years. Any missing values will be interpreted as zero (i.e. no cost to purchase). + * For commodities that are **not produced by processes in the model**, and are not free, prices should be provided for all years as they cannot be endogenously calculated. Lack of a price trajectory will be interpreted as a price of 0 for all periods (i.e. no cost to purchase). From 7e58bffab978d543c2d0c026ee3acaa8134d3f1a Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 24 Apr 2026 15:05:53 +0100 Subject: [PATCH 6/8] Fixes suggested by copilot --- docs/inputs/projections.rst | 2 +- src/muse/mca.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index ea1abdcdc..9706c3881 100644 --- a/docs/inputs/projections.rst +++ b/docs/inputs/projections.rst @@ -11,7 +11,7 @@ The interpretation of these prices depends on the type of commodity: or not depends on the processes in the model and the simulation settings: * For commodities that are **produced by processes in the model**, the behaviour - depends on the similation mode: + depends on the simulation mode: * In equilibrium mode (``maximum_iterations > 1``), price projections are **optional**. If not provided, prices are initialised to zero for all years. diff --git a/src/muse/mca.py b/src/muse/mca.py index c99dd6095..3140cc403 100644 --- a/src/muse/mca.py +++ b/src/muse/mca.py @@ -400,7 +400,7 @@ def single_year_iteration( # Update market prices # We only do this for the commodities that the sector is in charge of producing - # And only for regions/timeslices with >0 production in the investment year + # And only for regions/timeslices with >0 production supply = sector_market.supply supply = supply.where(supply.commodity.isin(sector.commodities), 0) updated_prices = updated_prices.where(supply == 0, sector_market.costs) From 6be5cfdad8e630f04ae95425f17783265afe01d3 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Fri, 24 Apr 2026 16:38:32 +0100 Subject: [PATCH 7/8] Add note to documentation Co-authored-by: Copilot --- docs/inputs/projections.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/inputs/projections.rst b/docs/inputs/projections.rst index 9706c3881..0452090de 100644 --- a/docs/inputs/projections.rst +++ b/docs/inputs/projections.rst @@ -17,8 +17,10 @@ The interpretation of these prices depends on the type of commodity: If not provided, prices are initialised to zero for all years. Once the commodity is produced, its price is calculated endogenously for that year and carried forward to subsequent years until updated again. - Until the first year of production, the price remains at the projected value + Until the first time a commodity is produced, the price remains at the projected value (or zero if no projection is provided). + **Note:** because prices are updated during intermediate iterations, a commodity may + retain a previously calculated price even if it is not produced in the final converged solution. * Outside equilibrium mode (``maximum_iterations = 1``), prices are **not** calculated endogenously, so projections are required for all years. Any missing values will be From d17be875a32ad35c4d6106dcced5a13603044359 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Thu, 7 May 2026 16:22:01 +0100 Subject: [PATCH 8/8] Update results files --- .../1-single-objective/Results/MCAPrices.csv | 12 +- .../Results/MCAPrices.csv | 12 +- .../1-correlation/Results/MCAPrices.csv | 12 +- .../1-introduction/Results/MCAPrices.csv | 12 +- .../2-scenario/Results/MCAPrices.csv | 12 +- .../1-new-region/Results/MCAPrices.csv | 24 +- .../Results/MCAPrices.csv | 26 +-- .../2-agents/Results/MCAPrices.csv | 26 +-- .../1-exogenous-demand/Results/MCAPrices.csv | 26 +-- .../1-carbon-budget/Results/MCAPrices.csv | 12 +- .../1-min-constraint/Results/MCAPrices.csv | 24 +- .../2-max-constraint/Results/MCAPrices.csv | 20 +- .../1-modify-timeslices/Results/MCAPrices.csv | 16 +- .../Results/MCAPrices.csv | 16 +- .../new-decision-metric/Results/MCAPrices.csv | 12 +- .../default/Results/MCAPrices.csv | 12 +- .../default_adhoc/Results/MCAPrices.csv | 12 +- .../default_correlation/Results/MCAPrices.csv | 12 +- .../default_retro/Results/MCAPrices.csv | 12 +- .../default_timeslice/Results/MCAPrices.csv | 12 +- .../Results/Power_Supply.csv | 219 +++++++----------- .../medium/Results/MCAPrices.csv | 12 +- .../minimum_service/Results/MCAPrices.csv | 6 +- .../multiple_agents/Results/MCAPrices.csv | 12 +- .../trade/Results/MCAPrices.csv | 48 ++-- 25 files changed, 286 insertions(+), 333 deletions(-) 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 65b19e43c..043197472 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,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 1a2408778..cba93dea5 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,14.0010,r1,0,MUS$2010/PJ,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 cef250158..3ca816672 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.1284,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.1284,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.1284,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.1284,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.1284,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.1284,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,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 4b7b577e2..f6c615adb 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,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 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 295447d40..24615298c 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,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 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 fd551de47..b0cce0c02 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,62 +1,62 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.5000,r2,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r2,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r2,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r2,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r2,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv index 13a406e40..a5c076953 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/1-residential-subsectors/Results/MCAPrices.csv @@ -1,41 +1,41 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2025 diff --git a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv index 73c148424..c117dd2f8 100644 --- a/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand-subsectors/2-agents/Results/MCAPrices.csv @@ -1,41 +1,41 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.5298,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,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 13a406e40..a5c076953 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,41 +1,41 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -cook,all-week,night,all-year,10.0746,r1,0,MUS$2010/PJ,2020 +cook,all-week,night,all-year,7.8572,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -cook,all-week,morning,all-year,10.0746,r1,1,MUS$2010/PJ,2020 +cook,all-week,morning,all-year,7.8572,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -cook,all-week,afternoon,all-year,10.0746,r1,2,MUS$2010/PJ,2020 +cook,all-week,afternoon,all-year,7.8572,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -cook,all-week,early-peak,all-year,10.0746,r1,3,MUS$2010/PJ,2020 +cook,all-week,early-peak,all-year,7.8572,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -cook,all-week,late-peak,all-year,10.0747,r1,4,MUS$2010/PJ,2020 +cook,all-week,late-peak,all-year,7.8572,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 -cook,all-week,evening,all-year,10.0747,r1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 +cook,all-week,evening,all-year,7.8572,r1,5,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,19.6620,r1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2025 heat,all-week,night,all-year,11.4046,r1,0,MUS$2010/PJ,2025 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,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 123b2e653..691503bf5 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,25.4255,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,25.4255,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,25.4255,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,25.4255,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,25.4255,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,25.4255,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,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 7db894641..60814470c 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,19.0270,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,16.2318,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,19.0270,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,16.2318,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,19.0270,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,16.2318,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,19.0270,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,16.2318,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 -electricity,all-week,late-peak,all-year,19.0270,r1,4,MUS$2010/PJ,2020 +electricity,all-week,late-peak,all-year,16.2318,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 -electricity,all-week,evening,all-year,19.0270,r1,5,MUS$2010/PJ,2020 +electricity,all-week,evening,all-year,16.2318,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,9.8410,r1,0,MUS$2010/PJ,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 44549fc46..8b149e804 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,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year -electricity,all-week,night,all-year,21.0041,r1,0,MUS$2010/PJ,2020 +electricity,all-week,night,all-year,17.4285,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 -electricity,all-week,morning,all-year,21.0041,r1,1,MUS$2010/PJ,2020 +electricity,all-week,morning,all-year,17.4285,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 -electricity,all-week,afternoon,all-year,21.0041,r1,2,MUS$2010/PJ,2020 +electricity,all-week,afternoon,all-year,17.4285,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 -electricity,all-week,early-peak,all-year,21.0041,r1,3,MUS$2010/PJ,2020 +electricity,all-week,early-peak,all-year,17.4285,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,10.4968,r1,0,MUS$2010/PJ,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 fccdae439..ad0becd9c 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,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.7988,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0743,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.7988,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0743,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,11.7988,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,9.0743,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.7988,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0743,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.7988,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0743,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.7988,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0743,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,11.7988,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,9.0743,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,11.7988,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,9.0743,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.4630,r1,0,MUS$2010/PJ,2025 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 0fd63eaeb..439675060 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,42 +1,42 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,10.3650,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0743,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,10.3650,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0743,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,mid-afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,mid-afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,mid-afternoon,all-year,10.3650,r1,2,MUS$2010/PJ,2020 +heat,all-week,mid-afternoon,all-year,9.0743,r1,2,MUS$2010/PJ,2020 wind,all-week,mid-afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,mid-afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,10.3650,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0743,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,10.3650,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0743,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,10.3650,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0743,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,early-morning,all-year,19.5000,r1,6,MUS$2010/PJ,2020 gas,all-week,early-morning,all-year,2.5500,r1,6,MUS$2010/PJ,2020 -heat,all-week,early-morning,all-year,10.3650,r1,6,MUS$2010/PJ,2020 +heat,all-week,early-morning,all-year,9.0743,r1,6,MUS$2010/PJ,2020 wind,all-week,early-morning,all-year,0.0000,r1,6,MUS$2010/PJ,2020 CO2f,all-week,early-morning,all-year,0.0831,r1,6,MUS$2010/kt,2020 electricity,all-week,late-afternoon,all-year,19.5000,r1,7,MUS$2010/PJ,2020 gas,all-week,late-afternoon,all-year,2.5500,r1,7,MUS$2010/PJ,2020 -heat,all-week,late-afternoon,all-year,10.3650,r1,7,MUS$2010/PJ,2020 +heat,all-week,late-afternoon,all-year,9.0743,r1,7,MUS$2010/PJ,2020 wind,all-week,late-afternoon,all-year,0.0000,r1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.0831,r1,7,MUS$2010/kt,2020 electricity,all-week,night,all-year,26.3034,r1,0,MUS$2010/PJ,2022 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 1a1d1219d..5dc558783 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 solar,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 solar,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 solar,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 solar,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 solar,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 solar,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index c4994db15..2f4943921 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.5272,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv index 46a9f060d..801bb16e4 100644 --- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv +++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,13.9023,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_correlation/Results/MCAPrices.csv b/tests/example_outputs/default_correlation/Results/MCAPrices.csv index cef250158..3ca816672 100644 --- a/tests/example_outputs/default_correlation/Results/MCAPrices.csv +++ b/tests/example_outputs/default_correlation/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8414,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.1284,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8414,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.1284,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8414,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.1284,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8414,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.1284,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8414,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.1284,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8414,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.1284,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,18.8703,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 4f3f3ea96..11cfc4ca1 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.1973,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 7c21a17bf..427192e8b 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,5.3588,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv index 850afe456..96c837634 100644 --- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv +++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv @@ -1,133 +1,86 @@ -asset,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year -0,electricity,all-week,night,2020,all-year,r1,0.0556,gasCCGT,0,MUS$2010/PJ,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2025 -0,CO2f,all-week,night,2020,all-year,r1,5.0928,gasCCGT,0,MUS$2010/kt,2025 -0,electricity,all-week,morning,2020,all-year,r1,0.0833,gasCCGT,1,MUS$2010/PJ,2025 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2025 -0,CO2f,all-week,morning,2020,all-year,r1,7.6392,gasCCGT,1,MUS$2010/kt,2025 -0,electricity,all-week,afternoon,2020,all-year,r1,0.0556,gasCCGT,2,MUS$2010/PJ,2025 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2025 -0,CO2f,all-week,afternoon,2020,all-year,r1,5.0928,gasCCGT,2,MUS$2010/kt,2025 -0,electricity,all-week,early-peak,2020,all-year,r1,0.0833,gasCCGT,3,MUS$2010/PJ,2025 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2025 -0,CO2f,all-week,early-peak,2020,all-year,r1,7.6392,gasCCGT,3,MUS$2010/kt,2025 -0,electricity,all-week,late-peak,2020,all-year,r1,0.1667,gasCCGT,4,MUS$2010/PJ,2025 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2025 -0,CO2f,all-week,late-peak,2020,all-year,r1,15.2783,gasCCGT,4,MUS$2010/kt,2025 -0,electricity,all-week,evening,2020,all-year,r1,0.1111,gasCCGT,5,MUS$2010/PJ,2025 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2025 -0,CO2f,all-week,evening,2020,all-year,r1,10.1856,gasCCGT,5,MUS$2010/kt,2025 -1,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2030 -2,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2030 -1,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2030 -2,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2030 -1,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2030 -2,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2030 -1,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2030 -2,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2030 -1,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2030 -2,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2030 -1,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2030 -2,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2030 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2035 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2035 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2035 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2035 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2035 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2035 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2035 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2035 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2035 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2035 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2035 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2035 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2035 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2035 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2035 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2035 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2035 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2035 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2040 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2040 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2040 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2040 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2040 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2040 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2040 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2040 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2040 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2040 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2040 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2040 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2040 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2040 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2040 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2040 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2040 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2040 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2040 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2040 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2040 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2040 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2040 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2040 -0,electricity,all-week,night,2025,all-year,r1,0.1132,windturbine,0,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2045 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2045 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2045 -0,electricity,all-week,morning,2025,all-year,r1,0.1698,windturbine,1,MUS$2010/PJ,2045 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2045 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2045 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2045 -0,electricity,all-week,afternoon,2025,all-year,r1,0.1132,windturbine,2,MUS$2010/PJ,2045 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2045 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2045 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2045 -0,electricity,all-week,early-peak,2025,all-year,r1,0.1698,windturbine,3,MUS$2010/PJ,2045 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2045 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2045 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2045 -0,electricity,all-week,late-peak,2025,all-year,r1,0.3396,windturbine,4,MUS$2010/PJ,2045 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2045 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2045 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2045 -0,electricity,all-week,evening,2025,all-year,r1,0.2264,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2045 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2045 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2045 -1,electricity,all-week,night,2030,all-year,r1,0.3000,windturbine,0,MUS$2010/PJ,2050 -2,electricity,all-week,night,2035,all-year,r1,0.3868,windturbine,0,MUS$2010/PJ,2050 -3,electricity,all-week,night,2040,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -4,electricity,all-week,night,2045,all-year,r1,0.1333,windturbine,0,MUS$2010/PJ,2050 -5,electricity,all-week,night,2050,all-year,r1,0.2465,windturbine,0,MUS$2010/PJ,2050 -1,electricity,all-week,morning,2030,all-year,r1,0.4500,windturbine,1,MUS$2010/PJ,2050 -2,electricity,all-week,morning,2035,all-year,r1,0.5802,windturbine,1,MUS$2010/PJ,2050 -3,electricity,all-week,morning,2040,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -4,electricity,all-week,morning,2045,all-year,r1,0.2000,windturbine,1,MUS$2010/PJ,2050 -5,electricity,all-week,morning,2050,all-year,r1,0.3698,windturbine,1,MUS$2010/PJ,2050 -1,electricity,all-week,afternoon,2030,all-year,r1,0.3000,windturbine,2,MUS$2010/PJ,2050 -2,electricity,all-week,afternoon,2035,all-year,r1,0.3868,windturbine,2,MUS$2010/PJ,2050 -3,electricity,all-week,afternoon,2040,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -4,electricity,all-week,afternoon,2045,all-year,r1,0.1333,windturbine,2,MUS$2010/PJ,2050 -5,electricity,all-week,afternoon,2050,all-year,r1,0.2465,windturbine,2,MUS$2010/PJ,2050 -1,electricity,all-week,early-peak,2030,all-year,r1,0.4500,windturbine,3,MUS$2010/PJ,2050 -2,electricity,all-week,early-peak,2035,all-year,r1,0.5802,windturbine,3,MUS$2010/PJ,2050 -3,electricity,all-week,early-peak,2040,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -4,electricity,all-week,early-peak,2045,all-year,r1,0.2000,windturbine,3,MUS$2010/PJ,2050 -5,electricity,all-week,early-peak,2050,all-year,r1,0.3698,windturbine,3,MUS$2010/PJ,2050 -1,electricity,all-week,late-peak,2030,all-year,r1,0.9000,windturbine,4,MUS$2010/PJ,2050 -2,electricity,all-week,late-peak,2035,all-year,r1,1.1604,windturbine,4,MUS$2010/PJ,2050 -3,electricity,all-week,late-peak,2040,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -4,electricity,all-week,late-peak,2045,all-year,r1,0.4000,windturbine,4,MUS$2010/PJ,2050 -5,electricity,all-week,late-peak,2050,all-year,r1,0.7396,windturbine,4,MUS$2010/PJ,2050 -1,electricity,all-week,evening,2030,all-year,r1,0.6000,windturbine,5,MUS$2010/PJ,2050 -2,electricity,all-week,evening,2035,all-year,r1,0.7736,windturbine,5,MUS$2010/PJ,2050 -3,electricity,all-week,evening,2040,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -4,electricity,all-week,evening,2045,all-year,r1,0.2667,windturbine,5,MUS$2010/PJ,2050 -5,electricity,all-week,evening,2050,all-year,r1,0.4931,windturbine,5,MUS$2010/PJ,2050 +asset,commodity,day,hour,installed,month,supply,technology,timeslice,year +1,electricity,all-week,night,2025,all-year,0.1688,windturbine,0,2025 +1,electricity,all-week,morning,2025,all-year,0.2531,windturbine,1,2025 +1,electricity,all-week,afternoon,2025,all-year,0.1688,windturbine,2,2025 +1,electricity,all-week,early-peak,2025,all-year,0.2531,windturbine,3,2025 +0,electricity,all-week,late-peak,2020,all-year,0.1667,gasCCGT,4,2025 +0,CO2f,all-week,late-peak,2020,all-year,15.2783,gasCCGT,4,2025 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2025 +1,electricity,all-week,evening,2025,all-year,0.3375,windturbine,5,2025 +1,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2030 +2,electricity,all-week,night,2030,all-year,0.0736,windturbine,0,2030 +1,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2030 +2,electricity,all-week,morning,2030,all-year,0.2802,windturbine,1,2030 +1,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2030 +2,electricity,all-week,afternoon,2030,all-year,0.0736,windturbine,2,2030 +1,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2030 +2,electricity,all-week,early-peak,2030,all-year,0.2802,windturbine,3,2030 +1,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2030 +2,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2030 +1,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2030 +2,electricity,all-week,evening,2030,all-year,0.4868,windturbine,5,2030 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2035 +1,electricity,all-week,night,2030,all-year,0.4604,windturbine,0,2035 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2035 +1,electricity,all-week,morning,2030,all-year,0.8604,windturbine,1,2035 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2035 +1,electricity,all-week,afternoon,2030,all-year,0.4604,windturbine,2,2035 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2035 +1,electricity,all-week,early-peak,2030,all-year,0.8604,windturbine,3,2035 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2035 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2035 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2035 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2035 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2035 +2,electricity,all-week,evening,2035,all-year,0.3604,windturbine,5,2035 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2040 +1,electricity,all-week,night,2030,all-year,0.5937,windturbine,0,2040 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2040 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2040 +2,electricity,all-week,morning,2035,all-year,0.1604,windturbine,1,2040 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2040 +1,electricity,all-week,afternoon,2030,all-year,0.5937,windturbine,2,2040 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2040 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2040 +2,electricity,all-week,early-peak,2035,all-year,0.1604,windturbine,3,2040 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2040 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2040 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2040 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2040 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2040 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2040 +2,electricity,all-week,evening,2035,all-year,0.6271,windturbine,5,2040 +0,electricity,all-week,night,2025,all-year,0.3396,windturbine,0,2045 +1,electricity,all-week,night,2030,all-year,0.7271,windturbine,0,2045 +0,electricity,all-week,morning,2025,all-year,0.3396,windturbine,1,2045 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2045 +2,electricity,all-week,morning,2035,all-year,0.3604,windturbine,1,2045 +0,electricity,all-week,afternoon,2025,all-year,0.3396,windturbine,2,2045 +1,electricity,all-week,afternoon,2030,all-year,0.7271,windturbine,2,2045 +0,electricity,all-week,early-peak,2025,all-year,0.3396,windturbine,3,2045 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2045 +2,electricity,all-week,early-peak,2035,all-year,0.3604,windturbine,3,2045 +0,electricity,all-week,late-peak,2025,all-year,0.3396,windturbine,4,2045 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2045 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2045 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2045 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2045 +0,electricity,all-week,evening,2025,all-year,0.3396,windturbine,5,2045 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2045 +2,electricity,all-week,evening,2035,all-year,0.8938,windturbine,5,2045 +1,electricity,all-week,night,2030,all-year,0.9000,windturbine,0,2050 +2,electricity,all-week,night,2035,all-year,0.3000,windturbine,0,2050 +1,electricity,all-week,morning,2030,all-year,0.9000,windturbine,1,2050 +2,electricity,all-week,morning,2035,all-year,0.9000,windturbine,1,2050 +1,electricity,all-week,afternoon,2030,all-year,0.9000,windturbine,2,2050 +2,electricity,all-week,afternoon,2035,all-year,0.3000,windturbine,2,2050 +1,electricity,all-week,early-peak,2030,all-year,0.9000,windturbine,3,2050 +2,electricity,all-week,early-peak,2035,all-year,0.9000,windturbine,3,2050 +1,electricity,all-week,late-peak,2030,all-year,0.9000,windturbine,4,2050 +2,electricity,all-week,late-peak,2035,all-year,1.1604,windturbine,4,2050 +3,electricity,all-week,late-peak,2040,all-year,0.4000,windturbine,4,2050 +4,electricity,all-week,late-peak,2045,all-year,0.4000,windturbine,4,2050 +5,electricity,all-week,late-peak,2050,all-year,0.7396,windturbine,4,2050 +1,electricity,all-week,evening,2030,all-year,0.9000,windturbine,5,2050 +2,electricity,all-week,evening,2035,all-year,1.1604,windturbine,5,2050 +3,electricity,all-week,evening,2040,all-year,0.3396,windturbine,5,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 88567d7d7..731c928da 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -1,37 +1,37 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/GWh,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8475,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.4580,r1,0,MUS$2010/PJ,2020 cook,all-week,night,all-year,5.1474,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/GWh,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8475,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.4580,r1,1,MUS$2010/PJ,2020 cook,all-week,morning,all-year,5.1474,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/GWh,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8475,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.4580,r1,2,MUS$2010/PJ,2020 cook,all-week,afternoon,all-year,5.1474,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/GWh,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8475,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.4580,r1,3,MUS$2010/PJ,2020 cook,all-week,early-peak,all-year,5.1474,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/GWh,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8475,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.4580,r1,4,MUS$2010/PJ,2020 cook,all-week,late-peak,all-year,5.1474,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/GWh,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8475,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.4580,r1,5,MUS$2010/PJ,2020 cook,all-week,evening,all-year,5.1474,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 765b08e4f..a18e90924 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -2,7 +2,7 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year fuel1,all-week,all-day,winter,1.0000,r1,0,MUS$2010/PJ,2010 fuel2,all-week,all-day,winter,9.5512,r1,0,MUS$2010/PJ,2010 fuel3,all-week,all-day,winter,0.0533,r1,0,MUS$2010/PJ,2010 -ammonia,all-week,all-day,winter,397.8624,r1,0,MUS$2010/Mt,2010 +ammonia,all-week,all-day,winter,373.3042,r1,0,MUS$2010/Mt,2010 CO2f,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2r,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 CO2c,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 @@ -11,7 +11,7 @@ N2O,all-week,all-day,winter,0.0000,r1,0,MUS$2010/kt,2010 fuel1,all-week,all-day,summer,1.0000,r1,1,MUS$2010/PJ,2010 fuel2,all-week,all-day,summer,9.5512,r1,1,MUS$2010/PJ,2010 fuel3,all-week,all-day,summer,0.0533,r1,1,MUS$2010/PJ,2010 -ammonia,all-week,all-day,summer,397.8624,r1,1,MUS$2010/Mt,2010 +ammonia,all-week,all-day,summer,373.3042,r1,1,MUS$2010/Mt,2010 CO2f,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2r,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 CO2c,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 @@ -20,7 +20,7 @@ N2O,all-week,all-day,summer,0.0000,r1,1,MUS$2010/kt,2010 fuel1,all-week,all-day,spring-autumn,1.0000,r1,2,MUS$2010/PJ,2010 fuel2,all-week,all-day,spring-autumn,9.5512,r1,2,MUS$2010/PJ,2010 fuel3,all-week,all-day,spring-autumn,0.0533,r1,2,MUS$2010/PJ,2010 -ammonia,all-week,all-day,spring-autumn,397.8624,r1,2,MUS$2010/Mt,2010 +ammonia,all-week,all-day,spring-autumn,373.3042,r1,2,MUS$2010/Mt,2010 CO2f,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2r,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 CO2c,all-week,all-day,spring-autumn,0.0000,r1,2,MUS$2010/kt,2010 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index d2db91c9d..558ebcb07 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -1,32 +1,32 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,19.5000,r1,0,MUS$2010/PJ,2020 gas,all-week,night,all-year,2.5500,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8409,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,9.0802,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0831,r1,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.5000,r1,1,MUS$2010/PJ,2020 gas,all-week,morning,all-year,2.5500,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8409,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,9.0802,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0831,r1,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.5000,r1,2,MUS$2010/PJ,2020 gas,all-week,afternoon,all-year,2.5500,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8409,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,9.0802,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0831,r1,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.5000,r1,3,MUS$2010/PJ,2020 gas,all-week,early-peak,all-year,2.5500,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8409,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,9.0802,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0831,r1,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.5000,r1,4,MUS$2010/PJ,2020 gas,all-week,late-peak,all-year,2.5500,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8409,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,9.0802,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0831,r1,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.5000,r1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,2.5500,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8409,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,9.0802,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0831,r1,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,24.2058,r1,0,MUS$2010/PJ,2025 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index be65f99b6..ba9f9fa47 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -1,62 +1,62 @@ commodity,day,hour,month,prices,region,timeslice,units_prices,year electricity,all-week,night,all-year,13.9815,r1,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,11.2701,r1,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,11.8176,r1,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,10.7721,r1,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,11.1464,r1,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r1,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r1,0,MUS$2010/kt,2020 electricity,all-week,night,all-year,19.1389,r2,0,MUS$2010/PJ,2020 -gas,all-week,night,all-year,4.7168,r2,0,MUS$2010/PJ,2020 -heat,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 +gas,all-week,night,all-year,11.7559,r2,0,MUS$2010/PJ,2020 +heat,all-week,night,all-year,14.1655,r2,0,MUS$2010/PJ,2020 wind,all-week,night,all-year,0.0000,r2,0,MUS$2010/PJ,2020 CO2f,all-week,night,all-year,0.0000,r2,0,MUS$2010/kt,2020 electricity,all-week,morning,all-year,13.9815,r1,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,11.2701,r1,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,11.8176,r1,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,10.7721,r1,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,11.1464,r1,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r1,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r1,1,MUS$2010/kt,2020 electricity,all-week,morning,all-year,19.1389,r2,1,MUS$2010/PJ,2020 -gas,all-week,morning,all-year,4.7168,r2,1,MUS$2010/PJ,2020 -heat,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 +gas,all-week,morning,all-year,11.7559,r2,1,MUS$2010/PJ,2020 +heat,all-week,morning,all-year,14.1655,r2,1,MUS$2010/PJ,2020 wind,all-week,morning,all-year,0.0000,r2,1,MUS$2010/PJ,2020 CO2f,all-week,morning,all-year,0.0000,r2,1,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,13.9815,r1,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,11.2701,r1,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,11.8176,r1,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,10.7721,r1,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,11.1464,r1,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r1,2,MUS$2010/kt,2020 electricity,all-week,afternoon,all-year,19.1389,r2,2,MUS$2010/PJ,2020 -gas,all-week,afternoon,all-year,4.7168,r2,2,MUS$2010/PJ,2020 -heat,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 +gas,all-week,afternoon,all-year,11.7559,r2,2,MUS$2010/PJ,2020 +heat,all-week,afternoon,all-year,14.1655,r2,2,MUS$2010/PJ,2020 wind,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/PJ,2020 CO2f,all-week,afternoon,all-year,0.0000,r2,2,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,13.9815,r1,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,11.2701,r1,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,11.8176,r1,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,10.7721,r1,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,11.1464,r1,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r1,3,MUS$2010/kt,2020 electricity,all-week,early-peak,all-year,19.1389,r2,3,MUS$2010/PJ,2020 -gas,all-week,early-peak,all-year,4.7168,r2,3,MUS$2010/PJ,2020 -heat,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 +gas,all-week,early-peak,all-year,11.7559,r2,3,MUS$2010/PJ,2020 +heat,all-week,early-peak,all-year,14.1655,r2,3,MUS$2010/PJ,2020 wind,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/PJ,2020 CO2f,all-week,early-peak,all-year,0.0000,r2,3,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,13.9815,r1,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,11.2701,r1,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,11.8176,r1,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,10.7721,r1,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,11.1464,r1,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r1,4,MUS$2010/kt,2020 electricity,all-week,late-peak,all-year,19.1389,r2,4,MUS$2010/PJ,2020 -gas,all-week,late-peak,all-year,4.7168,r2,4,MUS$2010/PJ,2020 -heat,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 +gas,all-week,late-peak,all-year,11.7559,r2,4,MUS$2010/PJ,2020 +heat,all-week,late-peak,all-year,14.1655,r2,4,MUS$2010/PJ,2020 wind,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/PJ,2020 CO2f,all-week,late-peak,all-year,0.0000,r2,4,MUS$2010/kt,2020 electricity,all-week,evening,all-year,13.9815,r1,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,11.2701,r1,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,11.8176,r1,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,10.7721,r1,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,11.1464,r1,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0000,r1,5,MUS$2010/kt,2020 electricity,all-week,evening,all-year,19.1389,r2,5,MUS$2010/PJ,2020 -gas,all-week,evening,all-year,4.7168,r2,5,MUS$2010/PJ,2020 -heat,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 +gas,all-week,evening,all-year,11.7559,r2,5,MUS$2010/PJ,2020 +heat,all-week,evening,all-year,14.1655,r2,5,MUS$2010/PJ,2020 wind,all-week,evening,all-year,0.0000,r2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.0000,r2,5,MUS$2010/kt,2020 electricity,all-week,night,all-year,20.9956,r1,0,MUS$2010/PJ,2025