From d6ae3a27c08366afee9b24336a6e935694f54905 Mon Sep 17 00:00:00 2001 From: HarmonicReflux Date: Mon, 8 Jul 2024 15:41:46 +0100 Subject: [PATCH 1/2] Set MinimumServiceFactor to 0 for relevant file and removed TechnodataTimeslices.csv for residential sector. Also, reworked relevant part of the notebook documentation. --- .../residential/TechnodataTimeslices.csv | 14 -------- .../residential/TechnodataTimeslices.csv | 14 -------- .../min-max-timeslice-constraints.ipynb | 34 +++++++++---------- .../technodata/power/TechnodataTimeslices.csv | 24 ++++++------- .../residential/TechnodataTimeslices.csv | 14 -------- 5 files changed, 29 insertions(+), 71 deletions(-) delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv delete mode 100644 docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv delete mode 100644 src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv deleted file mode 100644 index 847fd4953..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/technodata/residential/TechnodataTimeslices.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor -Unit,-,Year,-,-,-,-,- -heatpump,R1,2020,upper,all-year,all-week,night,0.9 -heatpump,R1,2020,upper,all-year,all-week,morning,0.9 -heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9 -heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,evening,0.9 -gasboiler,R1,2020,upper,all-year,all-week,night,0.9 -gasboiler,R1,2020,upper,all-year,all-week,morning,0.9 -gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9 -gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,evening,0.9 diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv deleted file mode 100644 index a21c49c0e..000000000 --- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/technodata/residential/TechnodataTimeslices.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor -Unit,-,Year,-,-,-,-,- -heatpump,R1,2020,upper,all-year,all-week,night,0.9 -heatpump,R1,2020,upper,all-year,all-week,morning,0.9 -heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9 -heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,evening,0.9 -gasboiler,R1,2020,upper,all-year,all-week,night,0.9 -gasboiler,R1,2020,upper,all-year,all-week,morning,0.9 -gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9 -gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,evening,0.9 diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb index 6bd386543..abb60fbd1 100644 --- a/docs/user-guide/min-max-timeslice-constraints.ipynb +++ b/docs/user-guide/min-max-timeslice-constraints.ipynb @@ -30,28 +30,28 @@ "python -m muse --model default_timeslice --copy PATH/TO/COPY/THE/MODEL/TO\n", "```\n", "\n", - "You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` and `residential` sectors, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n", - "The majority of these columns are self explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n", + "You will see that, compared to the `default` example, this model has an additional `TechnodataTimeslices.csv` file in the `power` sector, which has the columns `ProcessName`, `RegionName`, `Time`, `month`, `day`, `hour`, `UtilizationFactor`, `MinimumServiceFactor`.\n", + "The majority of these columns are self-explanatory, and correspond to the columns in other `csv` files - for instance, `ProcessName`, `RegionName` and `Time`. \n", "The `UtilizationFactor` column specifies the maximum utilization factor for the respective technologies in the respective timeslices, and the `MinimumServiceFactor` specifies the minimum service factor of a technology.\n", "The timeslice based columns, however, are dynamic and will match the levels as defined in the `toml` file. \n", "\n", "We will modify the minimum service factor for `gasCCGT` in the `power` sector as follows.\n", "\n", - "|ProcessName|RegionName|Time|month|day|hour|UtilizationFactor|MinimumServiceFactor|\n", - "|-|-|-|-|-|-|-|-|\n", - "|Unit|-|Year|-|-|-|-|-|\n", - "|gasCCGT|R1|2020|all-year|all-week|night|1|**0.2**|\n", - "|gasCCGT|R1|2020|all-year|all-week|morning|1|**0.4**|\n", - "|gasCCGT|R1|2020|all-year|all-week|afternoon|1|**0.6**|\n", - "|gasCCGT|R1|2020|all-year|all-week|early-peak|1|**0.4**|\n", - "|gasCCGT|R1|2020|all-year|all-week|late-peak|1|**0.8**|\n", - "|gasCCGT|R1|2020|all-year|all-week|evening|1|**1**|\n", - "|windturbine|R1|2020|all-year|all-week|night|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|morning|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|afternoon|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|early-peak|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|late-peak|1|1|\n", - "|windturbine|R1|2020|all-year|all-week|evening|1|1|\n" + "| ProcessName | RegionName | Time | month | day | hour | UtilizationFactor | MinimumServiceFactor |\n", + "|-------------|------------|------|----------|----------|------------|-------------------|----------------------|\n", + "| Unit | - | Year | - | - | - | - | - |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | night | 1 | **0.2** |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | morning | 1 | **0.4** |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | afternoon | 1 | **0.6** |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | early-peak | 1 | **0.4** |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | late-peak | 1 | **0.8** |\n", + "| gasCCGT | R1 | 2020 | all-year | all-week | evening | 1 | **1** |\n", + "| windturbine | R1 | 2020 | all-year | all-week | night | 1 | 0 |\n", + "| windturbine | R1 | 2020 | all-year | all-week | morning | 1 | 0 |\n", + "| windturbine | R1 | 2020 | all-year | all-week | afternoon | 1 | 0 |\n", + "| windturbine | R1 | 2020 | all-year | all-week | early-peak | 1 | 0 |\n", + "| windturbine | R1 | 2020 | all-year | all-week | late-peak | 1 | 0 |\n", + "| windturbine | R1 | 2020 | all-year | all-week | evening | 1 | 0 |\n" ] }, { diff --git a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv index 824ff170b..a9b9e06bc 100644 --- a/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv +++ b/src/muse/data/example/default_timeslice/technodata/power/TechnodataTimeslices.csv @@ -1,14 +1,14 @@ ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor,MinimumServiceFactor Unit,-,Year,-,-,-,-,-,- -gasCCGT,R1,2020,upper,all-year,all-week,night,1,1 -gasCCGT,R1,2020,upper,all-year,all-week,morning,1,1 -gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,1 -gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,1 -gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,1 -gasCCGT,R1,2020,upper,all-year,all-week,evening,1,1 -windturbine,R1,2020,upper,all-year,all-week,night,1,1 -windturbine,R1,2020,upper,all-year,all-week,morning,1,1 -windturbine,R1,2020,upper,all-year,all-week,afternoon,1,1 -windturbine,R1,2020,upper,all-year,all-week,early-peak,1,1 -windturbine,R1,2020,upper,all-year,all-week,late-peak,1,1 -windturbine,R1,2020,upper,all-year,all-week,evening,1,1 +gasCCGT,R1,2020,upper,all-year,all-week,night,1,0 +gasCCGT,R1,2020,upper,all-year,all-week,morning,1,0 +gasCCGT,R1,2020,upper,all-year,all-week,afternoon,1,0 +gasCCGT,R1,2020,upper,all-year,all-week,early-peak,1,0 +gasCCGT,R1,2020,upper,all-year,all-week,late-peak,1,0 +gasCCGT,R1,2020,upper,all-year,all-week,evening,1,0 +windturbine,R1,2020,upper,all-year,all-week,night,1,0 +windturbine,R1,2020,upper,all-year,all-week,morning,1,0 +windturbine,R1,2020,upper,all-year,all-week,afternoon,1,0 +windturbine,R1,2020,upper,all-year,all-week,early-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,late-peak,1,0 +windturbine,R1,2020,upper,all-year,all-week,evening,1,0 diff --git a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv b/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv deleted file mode 100644 index a21c49c0e..000000000 --- a/src/muse/data/example/default_timeslice/technodata/residential/TechnodataTimeslices.csv +++ /dev/null @@ -1,14 +0,0 @@ -ProcessName,RegionName,Time,ObjSort,month,day,hour,UtilizationFactor -Unit,-,Year,-,-,-,-,- -heatpump,R1,2020,upper,all-year,all-week,night,0.9 -heatpump,R1,2020,upper,all-year,all-week,morning,0.9 -heatpump,R1,2020,upper,all-year,all-week,afternoon,0.9 -heatpump,R1,2020,upper,all-year,all-week,early-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,late-peak,0.9 -heatpump,R1,2020,upper,all-year,all-week,evening,0.9 -gasboiler,R1,2020,upper,all-year,all-week,night,0.9 -gasboiler,R1,2020,upper,all-year,all-week,morning,0.9 -gasboiler,R1,2020,upper,all-year,all-week,afternoon,0.9 -gasboiler,R1,2020,upper,all-year,all-week,early-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,late-peak,0.9 -gasboiler,R1,2020,upper,all-year,all-week,evening,0.9 From ec75afb611616d60c7dc673126f7c92e87e7d417 Mon Sep 17 00:00:00 2001 From: HarmonicReflux Date: Mon, 8 Jul 2024 15:47:17 +0100 Subject: [PATCH 2/2] Updated results files for default_timeslice model for MinimumServiceFactor set to zero. --- .../default_timeslice/Gas/Capacity/2020.csv | 9 +- .../default_timeslice/Gas/Capacity/2025.csv | 9 +- .../default_timeslice/Gas/Capacity/2030.csv | 9 +- .../default_timeslice/Gas/Capacity/2035.csv | 9 +- .../default_timeslice/Gas/Capacity/2040.csv | 9 +- .../default_timeslice/Gas/Capacity/2045.csv | 9 +- .../default_timeslice/Gas/Capacity/2050.csv | 9 +- .../default_timeslice/MCACapacity.csv | 8 +- .../default_timeslice/MCAMetric_Supply.csv | 24 +-- .../default_timeslice/MCAPrices.csv | 204 +++++++++--------- .../default_timeslice/Power/Supply/2020.csv | 36 +--- .../default_timeslice/Power/Supply/2025.csv | 44 ++-- .../default_timeslice/Power/Supply/2030.csv | 56 ++--- .../default_timeslice/Power/Supply/2035.csv | 84 ++++---- .../default_timeslice/Power/Supply/2040.csv | 108 +++++----- .../default_timeslice/Power/Supply/2045.csv | 120 +++++------ .../default_timeslice/Power/Supply/2050.csv | 120 +++++------ 17 files changed, 398 insertions(+), 469 deletions(-) diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv index c62b307ba..d1ee882b2 100644 --- a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv +++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv @@ -1,9 +1,4 @@ asset,year,region,technology,installed,capacity 0,2020,R1,gassupply1,2020,15.00000000000 -0,2025,R1,gassupply1,2020,17.57780000000 -0,2030,R1,gassupply1,2020,10.07780000000 -0,2035,R1,gassupply1,2020,2.57780000000 -0,2040,R1,gassupply1,2020,2.57780000000 -0,2045,R1,gassupply1,2020,2.57780000000 -0,2050,R1,gassupply1,2020,2.57780000000 -0,2059,R1,gassupply1,2020,2.57780000000 +0,2025,R1,gassupply1,2020,15.00000000000 +0,2030,R1,gassupply1,2020,7.50000000000 diff --git a/tests/example_outputs/default_timeslice/MCACapacity.csv b/tests/example_outputs/default_timeslice/MCACapacity.csv index bfe7b553a..238432c70 100644 --- a/tests/example_outputs/default_timeslice/MCACapacity.csv +++ b/tests/example_outputs/default_timeslice/MCACapacity.csv @@ -6,25 +6,23 @@ A1,5.00000000000,R1,1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,11,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,1,2020,R1,power,gasCCGT,newcapa,2025 A1,1.00000000000,R1,12,2020,R1,power,windturbine,newcapa,2025 -A1,17.57780000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025 +A1,15.00000000000,R1,1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,16,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,17,2025,R1,residential,heatpump,newcapa,2030 A1,1.00000000000,R1,18,2020,R1,power,windturbine,newcapa,2030 A1,1.00000000000,R1,19,2025,R1,power,windturbine,newcapa,2030 -A1,10.07780000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.50000000000,R1,2,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,28,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,29,2030,R1,residential,heatpump,newcapa,2035 A1,1.00000000000,R1,26,2020,R1,power,windturbine,newcapa,2035 A1,1.00000000000,R1,27,2025,R1,power,windturbine,newcapa,2035 A1,2.00000000000,R1,28,2030,R1,power,windturbine,newcapa,2035 -A1,2.57780000000,R1,3,2020,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,45,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,46,2035,R1,residential,heatpump,newcapa,2040 A1,1.00000000000,R1,36,2020,R1,power,windturbine,newcapa,2040 A1,1.00000000000,R1,37,2025,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,38,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,39,2035,R1,power,windturbine,newcapa,2040 -A1,2.57780000000,R1,4,2020,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,66,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,67,2040,R1,residential,heatpump,newcapa,2045 A1,1.00000000000,R1,48,2020,R1,power,windturbine,newcapa,2045 @@ -32,7 +30,6 @@ A1,1.00000000000,R1,49,2025,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,50,2030,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,51,2035,R1,power,windturbine,newcapa,2045 A1,2.00000000000,R1,52,2040,R1,power,windturbine,newcapa,2045 -A1,2.57780000000,R1,5,2020,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,91,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,92,2045,R1,residential,heatpump,newcapa,2050 A1,1.00000000000,R1,70,2025,R1,power,windturbine,newcapa,2050 @@ -40,4 +37,3 @@ A1,2.00000000000,R1,71,2030,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,72,2035,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,73,2040,R1,power,windturbine,newcapa,2050 A1,2.00000000000,R1,74,2045,R1,power,windturbine,newcapa,2050 -A1,2.57780000000,R1,6,2020,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv index 94b202c6f..235684bea 100644 --- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv +++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv @@ -11,12 +11,12 @@ A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,resident A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,194.13000000000,gasboiler,4,MUS$2010/kt,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.00000000000,gasboiler,5,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,129.42000000000,gasboiler,5,MUS$2010/kt,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.76711378353,gassupply1,0,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.12927844588,gassupply1,1,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.76711378353,gassupply1,2,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.12927844588,gassupply1,3,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.21577243293,gassupply1,4,MUS$2010/PJ,2020 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.49144310823,gassupply1,5,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,3.48000000000,gassupply1,4,MUS$2010/PJ,2020 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.32000000000,gassupply1,5,MUS$2010/PJ,2020 A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025 @@ -53,12 +53,12 @@ A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,p A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,gasCCGT,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.42222222222,windturbine,5,MUS$2010/PJ,2025 A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,38.70511111111,gasCCGT,5,MUS$2010/kt,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.99222222222,gassupply1,0,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,2.15333333333,gassupply1,1,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.99222222222,gassupply1,2,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,2.15333333333,gassupply1,3,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,2.63666666667,gassupply1,4,MUS$2010/PJ,2025 -A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,2.31444444444,gassupply1,5,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.32222222222,gassupply1,0,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.48333333333,gassupply1,1,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.32222222222,gassupply1,2,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.48333333333,gassupply1,3,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.41200000000,gassupply1,4,MUS$2010/PJ,2025 +A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.64444444444,gassupply1,5,MUS$2010/PJ,2025 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030 A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030 A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030 diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv index 8d469cacd..6300a67e6 100644 --- a/tests/example_outputs/default_timeslice/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/MCAPrices.csv @@ -23,147 +23,147 @@ timeslice,commodity,region,prices,year "('all-year', 'all-week', 'evening')",gas,R1,7.15280000000,2020 "('all-year', 'all-week', 'evening')",heat,R1,100.00000000000,2020 "('all-year', 'all-week', 'evening')",CO2f,R1,0.08310000000,2020 -"('all-year', 'all-week', 'night')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2025 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2025 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2025 "('all-year', 'all-week', 'night')",heat,R1,1.07360000000,2025 "('all-year', 'all-week', 'night')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'morning')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2025 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2025 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2025 "('all-year', 'all-week', 'morning')",heat,R1,1.61040000000,2025 "('all-year', 'all-week', 'morning')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'afternoon')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2025 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2025 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2025 "('all-year', 'all-week', 'afternoon')",heat,R1,1.07360000000,2025 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'early-peak')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2025 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2025 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2025 "('all-year', 'all-week', 'early-peak')",heat,R1,1.61040000000,2025 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'late-peak')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2025 +"('all-year', 'all-week', 'late-peak')",electricity,R1,1.73400000000,2025 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2025 "('all-year', 'all-week', 'late-peak')",heat,R1,3.22070000000,2025 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'evening')",electricity,R1,2.13520000000,2025 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2025 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2025 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2025 "('all-year', 'all-week', 'evening')",heat,R1,2.14720000000,2025 "('all-year', 'all-week', 'evening')",CO2f,R1,0.12010000000,2025 -"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2030 -"('all-year', 'all-week', 'night')",heat,R1,0.10950000000,2030 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2030 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2030 +"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2030 "('all-year', 'all-week', 'night')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2030 -"('all-year', 'all-week', 'morning')",heat,R1,0.16420000000,2030 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2030 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2030 +"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2030 "('all-year', 'all-week', 'morning')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2030 -"('all-year', 'all-week', 'afternoon')",heat,R1,0.10950000000,2030 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2030 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2030 +"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2030 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2030 -"('all-year', 'all-week', 'early-peak')",heat,R1,0.16420000000,2030 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2030 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2030 +"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2030 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2030 -"('all-year', 'all-week', 'late-peak')",heat,R1,0.32840000000,2030 +"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2030 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2030 +"('all-year', 'all-week', 'late-peak')",heat,R1,0.28020000000,2030 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2030 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2030 -"('all-year', 'all-week', 'evening')",heat,R1,0.21890000000,2030 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2030 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2030 +"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2030 "('all-year', 'all-week', 'evening')",CO2f,R1,0.15700000000,2030 -"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2035 -"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2035 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2035 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2035 +"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2035 "('all-year', 'all-week', 'night')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2035 -"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2035 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2035 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2035 +"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2035 "('all-year', 'all-week', 'morning')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2035 -"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2035 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2035 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2035 +"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2035 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2035 -"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2035 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2035 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2035 +"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2035 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2035 -"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2035 +"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2035 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2035 +"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2035 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2035 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2035 -"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2035 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2035 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2035 +"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2035 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035 -"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2040 -"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2040 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2040 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2040 +"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2040 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2040 -"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2040 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2040 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2040 +"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2040 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2040 -"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2040 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2040 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2040 +"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2040 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2040 -"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2040 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2040 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2040 +"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2040 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2040 -"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2040 +"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2040 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2040 +"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2040 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2040 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2040 -"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2040 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2040 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2040 +"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2040 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040 -"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2045 -"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2045 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2045 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2045 +"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2045 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2045 -"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2045 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2045 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2045 +"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2045 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2045 -"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2045 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2045 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2045 +"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2045 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2045 -"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2045 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2045 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2045 +"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2045 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2045 -"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2045 +"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2045 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2045 +"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2045 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2045 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2045 -"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2045 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2045 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2045 +"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2045 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045 -"('all-year', 'all-week', 'night')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'night')",gas,R1,0.07100000000,2050 -"('all-year', 'all-week', 'night')",heat,R1,0.02850000000,2050 +"('all-year', 'all-week', 'night')",electricity,R1,0.06670000000,2050 +"('all-year', 'all-week', 'night')",gas,R1,0.04150000000,2050 +"('all-year', 'all-week', 'night')",heat,R1,0.02670000000,2050 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050 -"('all-year', 'all-week', 'morning')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'morning')",gas,R1,0.07680000000,2050 -"('all-year', 'all-week', 'morning')",heat,R1,0.04270000000,2050 +"('all-year', 'all-week', 'morning')",electricity,R1,0.10000000000,2050 +"('all-year', 'all-week', 'morning')",gas,R1,0.06220000000,2050 +"('all-year', 'all-week', 'morning')",heat,R1,0.04210000000,2050 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050 -"('all-year', 'all-week', 'afternoon')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'afternoon')",gas,R1,0.07100000000,2050 -"('all-year', 'all-week', 'afternoon')",heat,R1,0.02850000000,2050 +"('all-year', 'all-week', 'afternoon')",electricity,R1,0.06670000000,2050 +"('all-year', 'all-week', 'afternoon')",gas,R1,0.04150000000,2050 +"('all-year', 'all-week', 'afternoon')",heat,R1,0.02670000000,2050 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050 -"('all-year', 'all-week', 'early-peak')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'early-peak')",gas,R1,0.07680000000,2050 -"('all-year', 'all-week', 'early-peak')",heat,R1,0.04270000000,2050 +"('all-year', 'all-week', 'early-peak')",electricity,R1,0.10000000000,2050 +"('all-year', 'all-week', 'early-peak')",gas,R1,0.06220000000,2050 +"('all-year', 'all-week', 'early-peak')",heat,R1,0.04210000000,2050 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050 -"('all-year', 'all-week', 'late-peak')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'late-peak')",gas,R1,0.09400000000,2050 -"('all-year', 'all-week', 'late-peak')",heat,R1,0.08550000000,2050 +"('all-year', 'all-week', 'late-peak')",electricity,R1,0.20000000000,2050 +"('all-year', 'all-week', 'late-peak')",gas,R1,0.18180000000,2050 +"('all-year', 'all-week', 'late-peak')",heat,R1,0.09620000000,2050 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050 -"('all-year', 'all-week', 'evening')",electricity,R1,0.11110000000,2050 -"('all-year', 'all-week', 'evening')",gas,R1,0.08250000000,2050 -"('all-year', 'all-week', 'evening')",heat,R1,0.05700000000,2050 +"('all-year', 'all-week', 'evening')",electricity,R1,0.13330000000,2050 +"('all-year', 'all-week', 'evening')",gas,R1,0.08300000000,2050 +"('all-year', 'all-week', 'evening')",heat,R1,0.05880000000,2050 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv index 6eacdc731..00b3f8100 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv @@ -1,31 +1,9 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000 -0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000 -0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000 -0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000 -0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000 -1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000 -1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000 -1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000 -1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000 -2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000 -2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000 -2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000 -2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000 -3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000 -3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000 -3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000 -3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000 -4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000 -4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000 -4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000 +0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000 +1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000 +2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000 +3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000 +4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000 +4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000 4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000 -5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000 -5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000 -5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000 -5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 +5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv index 3283ad74a..51182e94e 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv @@ -1,31 +1,21 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000 -0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000 -0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000 -1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000 -1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000 -2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000 -2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000 -3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000 -3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000 -4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000 +0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.42220000000 +0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000 +0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000 +1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.63330000000 +1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000 +1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000 +2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.42220000000 +2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000 +2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000 +3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.63330000000 +3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000 +3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000 +4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.26670000000 +4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,24.44530000000 4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000 -5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000 -5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 +5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,0.84440000000 +5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000 +5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv index 82a474a70..4a52d7f1d 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv @@ -1,31 +1,31 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 +0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.33330000000 +0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000 +0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33330000000 +0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000 +0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000 +1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.50000000000 +1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000 +1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.50000000000 +1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000 +1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000 +2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.33330000000 +2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000 +2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33330000000 +2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000 +2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000 +3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.50000000000 +3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000 +3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.50000000000 +3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000 +3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000 4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 +4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000 4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 +4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000 +4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000 +5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.66670000000 +5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000 +5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66670000000 +5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000 +5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv index 76dec2c11..def4be3b7 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv @@ -1,43 +1,43 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 +0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.20000000000 +0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000 +0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.20000000000 +0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000 +0,3,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.40000000000 +0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000 +0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000 +1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.30000000000 +1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000 +1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.30000000000 +1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000 +1,3,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.60000000000 +1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000 +1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000 +2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.20000000000 +2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000 +2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.20000000000 +2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000 +2,3,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.40000000000 +2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000 +2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000 +3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.30000000000 +3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000 +3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.30000000000 +3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000 +3,3,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.60000000000 +3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000 +3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000 +4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.60000000000 +4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000 +4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.60000000000 +4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000 +4,3,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.20000000000 +4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000 +4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000 +5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.40000000000 +5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000 +5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.40000000000 +5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000 +5,3,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.80000000000 +5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000 +5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv index d663c1a8c..f5d07646e 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv @@ -1,55 +1,55 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000 -1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000 -2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000 -3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000 -4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000 -5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000 +0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.15560000000 +0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000 +0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.15560000000 +0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000 +0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.31110000000 +0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000 +0,4,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.31110000000 +0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000 +0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000 +1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000 +1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000 +1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.23330000000 +1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000 +1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.46670000000 +1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000 +1,4,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.46670000000 +1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000 +1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000 +2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15560000000 +2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000 +2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.15560000000 +2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000 +2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.31110000000 +2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000 +2,4,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.31110000000 +2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000 +2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000 +3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000 +3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000 +3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.23330000000 +3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000 +3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.46670000000 +3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000 +3,4,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.46670000000 +3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000 +3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000 +4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000 +4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000 +4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.46670000000 +4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000 +4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.93330000000 +4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000 +4,4,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.93330000000 +4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000 +4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000 +5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.31110000000 +5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000 +5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.31110000000 +5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000 +5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.62220000000 +5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000 +5,4,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.62220000000 +5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000 +5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv index 156ac116f..dce17b90d 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv @@ -1,61 +1,61 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.00000000000 -0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000 -0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000 -0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000 -1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.00000000000 -1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000 -1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000 -1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000 -2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.00000000000 -2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000 -2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000 -2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000 -3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.00000000000 -3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000 -3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000 -3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000 -4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.00000000000 -4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000 -4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000 -4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000 -5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.00000000000 -5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000 -5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000 -5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000 +0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.13330000000 +0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000 +0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000 +0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000 +0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000 +0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000 +0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000 +0,5,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000 +0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000 +0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000 +1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.20000000000 +1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000 +1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000 +1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000 +1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000 +1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000 +1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000 +1,5,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000 +1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000 +1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000 +2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.13330000000 +2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000 +2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000 +2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000 +2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000 +2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000 +2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000 +2,5,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000 +2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000 +2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000 +3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.20000000000 +3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000 +3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000 +3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000 +3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000 +3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000 +3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000 +3,5,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000 +3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000 +3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000 +4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.40000000000 +4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000 +4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000 +4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000 +4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000 +4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000 +4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000 +4,5,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000 +4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000 +4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000 +5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.26670000000 +5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000 +5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000 +5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000 +5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000 +5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000 +5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000 +5,5,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000 +5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000 +5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000 diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv index 7e6a67618..df173a2f6 100644 --- a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv +++ b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv @@ -1,61 +1,61 @@ timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply -0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.00000000000 -0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,2.00000000000 -0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,2.00000000000 -0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000 -0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,2.00000000000 -0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000 -0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,2.00000000000 -0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,2.00000000000 -1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.00000000000 -1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,2.00000000000 -1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,2.00000000000 -1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000 -1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,2.00000000000 -1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000 -1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,2.00000000000 -1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,2.00000000000 -2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.00000000000 -2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,2.00000000000 -2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.00000000000 -2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000 -2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.00000000000 -2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000 -2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.00000000000 -2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,2.00000000000 -3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.00000000000 -3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,2.00000000000 -3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.00000000000 -3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000 -3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.00000000000 -3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000 -3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.00000000000 -3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,2.00000000000 -4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.00000000000 -4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,2.00000000000 -4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.00000000000 -4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000 -4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.00000000000 -4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000 -4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.00000000000 -4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,2.00000000000 -5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.00000000000 -5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,2.00000000000 -5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,2.00000000000 -5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000 -5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,2.00000000000 -5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000 -5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,2.00000000000 -5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,2.00000000000 +0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.13330000000 +0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.26670000000 +0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.24000000000 +0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.26670000000 +0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.24000000000 +0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.26670000000 +0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.24000000000 +0,6,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.26670000000 +0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.24000000000 +0,7,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24000000000 +1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.20000000000 +1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.40000000000 +1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.36000000000 +1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40000000000 +1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36000000000 +1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.40000000000 +1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36000000000 +1,6,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.40000000000 +1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.36000000000 +1,7,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.36000000000 +2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.13330000000 +2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.26670000000 +2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.24000000000 +2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.26670000000 +2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24000000000 +2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.26670000000 +2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24000000000 +2,6,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.26670000000 +2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.24000000000 +2,7,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24000000000 +3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.20000000000 +3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.40000000000 +3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.36000000000 +3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40000000000 +3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36000000000 +3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.40000000000 +3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36000000000 +3,6,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.40000000000 +3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.36000000000 +3,7,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.36000000000 +4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.40000000000 +4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.80000000000 +4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.72000000000 +4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.80000000000 +4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72000000000 +4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.80000000000 +4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.72000000000 +4,6,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.80000000000 +4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.72000000000 +4,7,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.72000000000 +5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.26670000000 +5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.53330000000 +5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.48000000000 +5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.53330000000 +5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48000000000 +5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.53330000000 +5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48000000000 +5,6,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.53330000000 +5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.48000000000 +5,7,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.48000000000