Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/model/dispatch_optimisation.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Setting either parameter to zero disables its corresponding penalty. The seasona
how strongly activity is spread within seasons, while the annual parameter controls how strongly it
is spread across seasons. Both are weighted objective terms, so their values should be small enough
that smoothing dispatch does not outweigh meaningful differences in operating cost (default for
both = `1e-6`).
`seasonal_utilisation_penalty` and `annual_utilisation_penalty` are `1e-6` and `1e-5` respectively).

---

Expand Down
2 changes: 1 addition & 1 deletion schemas/input/model.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ properties:
annual_utilisation_penalty:
type: number
description: Penalty per unit of capacity used across the whole year
default: 1e-6
default: 1e-5
notes: |
A small additive penalty to discourage assets from using a high capacity-equivalent peak
across the year. This should be very small, as it is only intended to break ties between
Expand Down
2 changes: 1 addition & 1 deletion src/model/parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl Default for ModelParameters {
fallback_pricing_strategy: PricingStrategy::FullCostAverage,
value_of_lost_load: MoneyPerFlow(1e9),
seasonal_utilisation_penalty: MoneyPerCapacityPerYear(1e-6),
annual_utilisation_penalty: MoneyPerCapacityPerYear(1e-6),
annual_utilisation_penalty: MoneyPerCapacityPerYear(1e-5),
max_ironing_out_iterations: 1,
price_tolerance: Dimensionless(1e-6),
capacity_margin: Dimensionless(0.2),
Expand Down
6 changes: 3 additions & 3 deletions tests/data/circularity/asset_capacities.csv
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ milestone_year,asset_id,capacity,num_tranches,mothballed_capacity,mothballed_tra
2030,17,3680.183145405077,26,0.0,0
2030,18,298.6475820926018,57,0.0,0
2030,19,2944.1465163240614,16,0.0,0
2030,20,165.3505808753475,27,0.0,0
2030,20,165.35058087534748,27,0.0,0
2040,5,3.964844,1,0.0,0
2040,6,2.999,1,0.0,0
2040,16,1849.28399075358,36,0.0,0
2040,18,298.6475820926018,57,0.0,0
2040,19,1288.064100891777,7,0.0,0
2040,20,165.3505808753475,27,0.0,0
2040,20,165.35058087534748,27,0.0,0
2040,21,942.563016229748,28,0.0,0
2040,22,2198.390989008045,39,0.0,0
2040,23,38.755532680196005,17,0.0,0
2040,24,5.471369319196239,6,0.0,0
2040,25,8.10573232473517,8,0.0,0
2040,26,153.84953248060512,21,0.0,0
2040,27,358.63594983962076,37,0.0,0
2040,28,972.485651665613,26,0.0,0
2040,28,972.4856516656132,26,0.0,0
2040,29,2349.6972514094086,33,0.0,0
2040,30,376.5677473316019,37,0.0,0
2040,31,2627.9227668603858,37,0.0,0
424 changes: 212 additions & 212 deletions tests/data/circularity/commodity_flows.csv

Large diffs are not rendered by default.

214 changes: 107 additions & 107 deletions tests/data/circularity/commodity_prices.csv
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ milestone_year,commodity_id,region_id,time_slice,price
2020,BIOPEL,GBR,autumn.evening,1.3263861634852976
2020,ELCTRI,GBR,winter.night,21.49691579707561
2020,ELCTRI,GBR,winter.day,21.57362452619159
2020,ELCTRI,GBR,winter.peak,61.08458576536421
2020,ELCTRI,GBR,winter.peak,61.08460383622336
2020,ELCTRI,GBR,winter.evening,21.97623710264242
2020,ELCTRI,GBR,peak.night,23.35166691707033
2020,ELCTRI,GBR,peak.day,21.72873722442201
Expand All @@ -127,10 +127,10 @@ milestone_year,commodity_id,region_id,time_slice,price
2020,ELCTRI,GBR,autumn.day,21.766650893538557
2020,ELCTRI,GBR,autumn.peak,22.339687292904443
2020,ELCTRI,GBR,autumn.evening,22.64419521636742
2020,H2YPRD,GBR,winter.night,139.0368929791349
2020,H2YPRD,GBR,winter.day,139.0368929791349
2020,H2YPRD,GBR,winter.peak,139.0368929791349
2020,H2YPRD,GBR,winter.evening,139.0368929791349
2020,H2YPRD,GBR,winter.night,139.0370405422343
2020,H2YPRD,GBR,winter.day,139.0370405422343
2020,H2YPRD,GBR,winter.peak,139.0370405422343
2020,H2YPRD,GBR,winter.evening,139.0370405422343
2020,H2YPRD,GBR,peak.night,147.78867977294186
2020,H2YPRD,GBR,peak.day,147.78867977294186
2020,H2YPRD,GBR,peak.peak,147.78867977294186
Expand All @@ -145,7 +145,7 @@ milestone_year,commodity_id,region_id,time_slice,price
2020,H2YPRD,GBR,autumn.evening,147.78867977294186
2020,TPASKM,GBR,winter.night,28.495385689540637
2020,TPASKM,GBR,winter.day,32.829212578566754
2020,TPASKM,GBR,winter.peak,35.23220285570176
2020,TPASKM,GBR,winter.peak,35.232203973447085
2020,TPASKM,GBR,winter.evening,32.860357329613414
2020,TPASKM,GBR,peak.night,28.495385689540637
2020,TPASKM,GBR,peak.day,32.84106648495028
Expand All @@ -161,7 +161,7 @@ milestone_year,commodity_id,region_id,time_slice,price
2020,TPASKM,GBR,autumn.evening,32.91188324496649
2020,RSHEAT,GBR,winter.night,49.77810057824592
2020,RSHEAT,GBR,winter.day,55.68894930934171
2020,RSHEAT,GBR,winter.peak,58.194725171786615
2020,RSHEAT,GBR,winter.peak,58.19472589458833
2020,RSHEAT,GBR,winter.evening,55.34514857748479
2020,RSHEAT,GBR,peak.night,46.17817409195631
2020,RSHEAT,GBR,peak.day,53.05468403881354
Expand All @@ -179,34 +179,34 @@ milestone_year,commodity_id,region_id,time_slice,price
2030,GASPRD,GBR,winter.day,10.83638347568378
2030,GASPRD,GBR,winter.peak,10.83638347568378
2030,GASPRD,GBR,winter.evening,10.83638347568378
2030,GASPRD,GBR,peak.night,9.555261952714954
2030,GASPRD,GBR,peak.day,9.555261952714954
2030,GASPRD,GBR,peak.peak,9.555261952714954
2030,GASPRD,GBR,peak.evening,9.555261952714954
2030,GASPRD,GBR,summer.night,5.695927420926498
2030,GASPRD,GBR,summer.day,5.695927420926498
2030,GASPRD,GBR,summer.peak,5.695927420926498
2030,GASPRD,GBR,summer.evening,5.695927420926498
2030,GASPRD,GBR,peak.night,9.555261952714952
2030,GASPRD,GBR,peak.day,9.555261952714952
2030,GASPRD,GBR,peak.peak,9.555261952714952
2030,GASPRD,GBR,peak.evening,9.555261952714952
2030,GASPRD,GBR,summer.night,5.6959274209264965
2030,GASPRD,GBR,summer.day,5.6959274209264965
2030,GASPRD,GBR,summer.peak,5.6959274209264965
2030,GASPRD,GBR,summer.evening,5.6959274209264965
2030,GASPRD,GBR,autumn.night,8.448257530546275
2030,GASPRD,GBR,autumn.day,8.448257530546275
2030,GASPRD,GBR,autumn.peak,8.448257530546275
2030,GASPRD,GBR,autumn.evening,8.448257530546275
2030,OILCRD,GBR,winter.night,5.695927420926498
2030,OILCRD,GBR,winter.day,5.695927420926498
2030,OILCRD,GBR,winter.peak,5.695927420926498
2030,OILCRD,GBR,winter.evening,5.695927420926498
2030,OILCRD,GBR,peak.night,5.695927420926497
2030,OILCRD,GBR,peak.day,5.695927420926497
2030,OILCRD,GBR,peak.peak,5.695927420926497
2030,OILCRD,GBR,peak.evening,5.695927420926497
2030,OILCRD,GBR,summer.night,5.695927420926498
2030,OILCRD,GBR,summer.day,5.695927420926498
2030,OILCRD,GBR,summer.peak,5.695927420926498
2030,OILCRD,GBR,summer.evening,5.695927420926498
2030,OILCRD,GBR,autumn.night,5.695927420926497
2030,OILCRD,GBR,autumn.day,5.695927420926497
2030,OILCRD,GBR,autumn.peak,5.695927420926497
2030,OILCRD,GBR,autumn.evening,5.695927420926497
2030,OILCRD,GBR,winter.night,5.695927420926497
2030,OILCRD,GBR,winter.day,5.695927420926497
2030,OILCRD,GBR,winter.peak,5.695927420926497
2030,OILCRD,GBR,winter.evening,5.695927420926497
2030,OILCRD,GBR,peak.night,5.6959274209264965
2030,OILCRD,GBR,peak.day,5.6959274209264965
2030,OILCRD,GBR,peak.peak,5.6959274209264965
2030,OILCRD,GBR,peak.evening,5.6959274209264965
2030,OILCRD,GBR,summer.night,5.695927420926496
2030,OILCRD,GBR,summer.day,5.695927420926496
2030,OILCRD,GBR,summer.peak,5.695927420926496
2030,OILCRD,GBR,summer.evening,5.695927420926496
2030,OILCRD,GBR,autumn.night,5.6959274209264965
2030,OILCRD,GBR,autumn.day,5.6959274209264965
2030,OILCRD,GBR,autumn.peak,5.6959274209264965
2030,OILCRD,GBR,autumn.evening,5.6959274209264965
2030,BIOPRD,GBR,winter.night,0.6590123864355235
2030,BIOPRD,GBR,winter.day,0.6590123864355235
2030,BIOPRD,GBR,winter.peak,0.6590123864355235
Expand All @@ -227,50 +227,50 @@ milestone_year,commodity_id,region_id,time_slice,price
2030,GASNAT,GBR,winter.day,16.715533485995145
2030,GASNAT,GBR,winter.peak,16.715533485995145
2030,GASNAT,GBR,winter.evening,16.715533485995145
2030,GASNAT,GBR,peak.night,15.370355886877876
2030,GASNAT,GBR,peak.day,15.370355886877876
2030,GASNAT,GBR,peak.peak,15.370355886877876
2030,GASNAT,GBR,peak.evening,15.370355886877876
2030,GASNAT,GBR,summer.night,11.318054628499999
2030,GASNAT,GBR,summer.day,11.318054628499999
2030,GASNAT,GBR,summer.peak,11.318054628499999
2030,GASNAT,GBR,summer.evening,11.318054628499999
2030,GASNAT,GBR,autumn.night,14.208001243600766
2030,GASNAT,GBR,autumn.day,14.208001243600766
2030,GASNAT,GBR,autumn.peak,14.208001243600766
2030,GASNAT,GBR,autumn.evening,14.208001243600766
2030,GASNAT,GBR,peak.night,15.370355886877874
2030,GASNAT,GBR,peak.day,15.370355886877874
2030,GASNAT,GBR,peak.peak,15.370355886877874
2030,GASNAT,GBR,peak.evening,15.370355886877874
2030,GASNAT,GBR,summer.night,11.318054628499997
2030,GASNAT,GBR,summer.day,11.318054628499997
2030,GASNAT,GBR,summer.peak,11.318054628499997
2030,GASNAT,GBR,summer.evening,11.318054628499997
2030,GASNAT,GBR,autumn.night,14.208001243600762
2030,GASNAT,GBR,autumn.day,14.208001243600762
2030,GASNAT,GBR,autumn.peak,14.208001243600762
2030,GASNAT,GBR,autumn.evening,14.208001243600762
2030,GASOLI,GBR,winter.night,10.76685057838598
2030,GASOLI,GBR,winter.day,10.76685057838598
2030,GASOLI,GBR,winter.peak,10.76685057838598
2030,GASOLI,GBR,winter.evening,10.76685057838598
2030,GASOLI,GBR,peak.night,10.76685057838598
2030,GASOLI,GBR,peak.day,10.76685057838598
2030,GASOLI,GBR,peak.peak,10.76685057838598
2030,GASOLI,GBR,peak.evening,10.76685057838598
2030,GASOLI,GBR,summer.night,10.76685057838598
2030,GASOLI,GBR,summer.day,10.76685057838598
2030,GASOLI,GBR,summer.peak,10.76685057838598
2030,GASOLI,GBR,summer.evening,10.76685057838598
2030,GASOLI,GBR,autumn.night,10.766850578385979
2030,GASOLI,GBR,autumn.day,10.766850578385979
2030,GASOLI,GBR,autumn.peak,10.766850578385979
2030,GASOLI,GBR,autumn.evening,10.766850578385979
2030,GASOLI,GBR,peak.night,10.766850578385975
2030,GASOLI,GBR,peak.day,10.766850578385975
2030,GASOLI,GBR,peak.peak,10.766850578385975
2030,GASOLI,GBR,peak.evening,10.766850578385975
2030,GASOLI,GBR,summer.night,10.766850578385977
2030,GASOLI,GBR,summer.day,10.766850578385977
2030,GASOLI,GBR,summer.peak,10.766850578385977
2030,GASOLI,GBR,summer.evening,10.766850578385977
2030,GASOLI,GBR,autumn.night,10.766850578385975
2030,GASOLI,GBR,autumn.day,10.766850578385975
2030,GASOLI,GBR,autumn.peak,10.766850578385975
2030,GASOLI,GBR,autumn.evening,10.766850578385975
2030,DIESEL,GBR,winter.night,10.76685057838598
2030,DIESEL,GBR,winter.day,10.76685057838598
2030,DIESEL,GBR,winter.peak,10.76685057838598
2030,DIESEL,GBR,winter.evening,10.76685057838598
2030,DIESEL,GBR,peak.night,10.76685057838598
2030,DIESEL,GBR,peak.day,10.76685057838598
2030,DIESEL,GBR,peak.peak,10.76685057838598
2030,DIESEL,GBR,peak.evening,10.76685057838598
2030,DIESEL,GBR,summer.night,10.76685057838598
2030,DIESEL,GBR,summer.day,10.76685057838598
2030,DIESEL,GBR,summer.peak,10.76685057838598
2030,DIESEL,GBR,summer.evening,10.76685057838598
2030,DIESEL,GBR,autumn.night,10.766850578385979
2030,DIESEL,GBR,autumn.day,10.766850578385979
2030,DIESEL,GBR,autumn.peak,10.766850578385979
2030,DIESEL,GBR,autumn.evening,10.766850578385979
2030,DIESEL,GBR,peak.night,10.766850578385975
2030,DIESEL,GBR,peak.day,10.766850578385975
2030,DIESEL,GBR,peak.peak,10.766850578385975
2030,DIESEL,GBR,peak.evening,10.766850578385975
2030,DIESEL,GBR,summer.night,10.766850578385977
2030,DIESEL,GBR,summer.day,10.766850578385977
2030,DIESEL,GBR,summer.peak,10.766850578385977
2030,DIESEL,GBR,summer.evening,10.766850578385977
2030,DIESEL,GBR,autumn.night,10.766850578385975
2030,DIESEL,GBR,autumn.day,10.766850578385975
2030,DIESEL,GBR,autumn.peak,10.766850578385975
2030,DIESEL,GBR,autumn.evening,10.766850578385975
2030,BIOPEL,GBR,winter.night,2.0919174304808115
2030,BIOPEL,GBR,winter.day,2.0919174304808115
2030,BIOPEL,GBR,winter.peak,2.0919174304808115
Expand All @@ -291,26 +291,26 @@ milestone_year,commodity_id,region_id,time_slice,price
2030,ELCTRI,GBR,winter.day,22.48259122501884
2030,ELCTRI,GBR,winter.peak,23.27921180436034
2030,ELCTRI,GBR,winter.evening,23.510787571387645
2030,ELCTRI,GBR,peak.night,25.802614793322427
2030,ELCTRI,GBR,peak.day,22.511411198323547
2030,ELCTRI,GBR,peak.peak,23.14996711322446
2030,ELCTRI,GBR,peak.evening,25.460531270147676
2030,ELCTRI,GBR,peak.night,25.802614793322423
2030,ELCTRI,GBR,peak.day,22.511411198323543
2030,ELCTRI,GBR,peak.peak,23.149967113224456
2030,ELCTRI,GBR,peak.evening,25.460531270147673
2030,ELCTRI,GBR,summer.night,11.945216262614379
2030,ELCTRI,GBR,summer.day,11.945216262614379
2030,ELCTRI,GBR,summer.peak,11.945216262614379
2030,ELCTRI,GBR,summer.evening,11.945216262614379
2030,ELCTRI,GBR,autumn.night,23.919198201154526
2030,ELCTRI,GBR,autumn.day,22.05828271063494
2030,ELCTRI,GBR,autumn.peak,23.15338936326698
2030,ELCTRI,GBR,autumn.evening,23.689455541286584
2030,H2YPRD,GBR,winter.night,13.916995795079334
2030,H2YPRD,GBR,winter.day,13.916995795079334
2030,H2YPRD,GBR,winter.peak,13.916995795079334
2030,H2YPRD,GBR,winter.evening,13.916995795079334
2030,H2YPRD,GBR,peak.night,13.916979568234572
2030,H2YPRD,GBR,peak.day,13.916979568234572
2030,H2YPRD,GBR,peak.peak,13.916979568234572
2030,H2YPRD,GBR,peak.evening,13.916979568234572
2030,ELCTRI,GBR,autumn.night,23.91919820115452
2030,ELCTRI,GBR,autumn.day,22.058282710634938
2030,ELCTRI,GBR,autumn.peak,23.153389363266974
2030,ELCTRI,GBR,autumn.evening,23.689455541286577
2030,H2YPRD,GBR,winter.night,13.917143358178746
2030,H2YPRD,GBR,winter.day,13.917143358178746
2030,H2YPRD,GBR,winter.peak,13.917143358178746
2030,H2YPRD,GBR,winter.evening,13.917143358178746
2030,H2YPRD,GBR,peak.night,13.916981089731078
2030,H2YPRD,GBR,peak.day,13.916981089731078
2030,H2YPRD,GBR,peak.peak,13.916981089731078
2030,H2YPRD,GBR,peak.evening,13.916981089731078
2030,H2YPRD,GBR,summer.night,4.413633538186637
2030,H2YPRD,GBR,summer.day,4.413633538186637
2030,H2YPRD,GBR,summer.peak,4.413633538186637
Expand All @@ -323,33 +323,33 @@ milestone_year,commodity_id,region_id,time_slice,price
2030,TPASKM,GBR,winter.day,30.833894962930774
2030,TPASKM,GBR,winter.peak,30.833894962930778
2030,TPASKM,GBR,winter.evening,30.833894962930778
2030,TPASKM,GBR,peak.night,30.833894962930778
2030,TPASKM,GBR,peak.day,30.833894962930774
2030,TPASKM,GBR,peak.peak,30.833894962930778
2030,TPASKM,GBR,peak.evening,30.833894962930778
2030,TPASKM,GBR,summer.night,30.833894962930778
2030,TPASKM,GBR,summer.day,30.833894962930774
2030,TPASKM,GBR,summer.peak,30.833894962930778
2030,TPASKM,GBR,summer.evening,30.833894962930778
2030,TPASKM,GBR,autumn.night,30.833894962930774
2030,TPASKM,GBR,autumn.day,30.833894962930774
2030,TPASKM,GBR,autumn.peak,30.833894962930774
2030,TPASKM,GBR,autumn.evening,30.833894962930774
2030,TPASKM,GBR,peak.night,30.83389496293077
2030,TPASKM,GBR,peak.day,30.83389496293077
2030,TPASKM,GBR,peak.peak,30.833894962930763
2030,TPASKM,GBR,peak.evening,30.833894962930767
2030,TPASKM,GBR,summer.night,30.83389496293077
2030,TPASKM,GBR,summer.day,30.83389496293077
2030,TPASKM,GBR,summer.peak,30.83389496293077
2030,TPASKM,GBR,summer.evening,30.83389496293077
2030,TPASKM,GBR,autumn.night,30.83389496293077
2030,TPASKM,GBR,autumn.day,30.83389496293077
2030,TPASKM,GBR,autumn.peak,30.833894962930763
2030,TPASKM,GBR,autumn.evening,30.833894962930767
2030,RSHEAT,GBR,winter.night,52.16456575149094
2030,RSHEAT,GBR,winter.day,62.05014150781135
2030,RSHEAT,GBR,winter.peak,81.46109188104124
2030,RSHEAT,GBR,winter.peak,81.46109188104126
2030,RSHEAT,GBR,winter.evening,58.49223845482817
2030,RSHEAT,GBR,peak.night,65.09118000607619
2030,RSHEAT,GBR,peak.night,65.0911800060762
2030,RSHEAT,GBR,peak.day,63.760912933240284
2030,RSHEAT,GBR,peak.peak,63.44465892036649
2030,RSHEAT,GBR,peak.evening,64.28083618915869
2030,RSHEAT,GBR,peak.peak,63.44465892036651
2030,RSHEAT,GBR,peak.evening,64.2808361891587
2030,RSHEAT,GBR,summer.night,50.658788493930096
2030,RSHEAT,GBR,summer.day,32.119896220460745
2030,RSHEAT,GBR,summer.peak,32.119896220460745
2030,RSHEAT,GBR,summer.evening,32.119896220460745
2030,RSHEAT,GBR,autumn.night,59.06847156929996
2030,RSHEAT,GBR,autumn.night,59.06847156929989
2030,RSHEAT,GBR,autumn.day,50.8262403129185
2030,RSHEAT,GBR,autumn.peak,98.13878163369219
2030,RSHEAT,GBR,autumn.peak,98.1387816336922
2030,RSHEAT,GBR,autumn.evening,48.89768270671781
2040,GASPRD,GBR,winter.night,5.785387816705663
2040,GASPRD,GBR,winter.day,5.785387816705663
Expand Down Expand Up @@ -458,7 +458,7 @@ milestone_year,commodity_id,region_id,time_slice,price
2040,ELCTRI,GBR,summer.night,12.67414593803195
2040,ELCTRI,GBR,summer.day,18.466340027583783
2040,ELCTRI,GBR,summer.peak,18.982342291193035
2040,ELCTRI,GBR,summer.evening,27.90957856268472
2040,ELCTRI,GBR,summer.evening,27.909623014502255
2040,ELCTRI,GBR,autumn.night,12.674145938031948
2040,ELCTRI,GBR,autumn.day,16.307136738382315
2040,ELCTRI,GBR,autumn.peak,17.878218828227617
Expand All @@ -471,10 +471,10 @@ milestone_year,commodity_id,region_id,time_slice,price
2040,H2YPRD,GBR,peak.day,10.559756733182441
2040,H2YPRD,GBR,peak.peak,10.559756733182441
2040,H2YPRD,GBR,peak.evening,10.559756733182441
2040,H2YPRD,GBR,summer.night,20.681654985604197
2040,H2YPRD,GBR,summer.day,20.681654985604197
2040,H2YPRD,GBR,summer.peak,20.681654985604197
2040,H2YPRD,GBR,summer.evening,20.681654985604197
2040,H2YPRD,GBR,summer.night,20.68180254870361
2040,H2YPRD,GBR,summer.day,20.68180254870361
2040,H2YPRD,GBR,summer.peak,20.68180254870361
2040,H2YPRD,GBR,summer.evening,20.68180254870361
2040,H2YPRD,GBR,autumn.night,10.559756733182441
2040,H2YPRD,GBR,autumn.day,10.559756733182441
2040,H2YPRD,GBR,autumn.peak,10.559756733182441
Expand All @@ -490,7 +490,7 @@ milestone_year,commodity_id,region_id,time_slice,price
2040,TPASKM,GBR,summer.night,22.484745428933703
2040,TPASKM,GBR,summer.day,27.43351476560274
2040,TPASKM,GBR,summer.peak,27.874379857538717
2040,TPASKM,GBR,summer.evening,35.50168523414014
2040,TPASKM,GBR,summer.evening,35.50172321314916
2040,TPASKM,GBR,autumn.night,22.484745428933703
2040,TPASKM,GBR,autumn.day,25.588721779727173
2040,TPASKM,GBR,autumn.peak,26.93103226715387
Expand Down
6 changes: 3 additions & 3 deletions tests/data/circularity_npv/asset_capacities.csv
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ milestone_year,asset_id,capacity,num_tranches,mothballed_capacity,mothballed_tra
2030,17,3680.183145405077,26,0.0,0
2030,18,298.6475820926018,57,0.0,0
2030,19,2944.1465163240614,16,0.0,0
2030,20,165.3505808753475,27,0.0,0
2030,20,165.35058087534748,27,0.0,0
2040,5,3.964844,1,0.0,0
2040,6,2.999,1,0.0,0
2040,16,1849.28399075358,36,0.0,0
2040,18,298.6475820926018,57,0.0,0
2040,19,1288.064100891777,7,0.0,0
2040,20,165.3505808753475,27,0.0,0
2040,20,165.35058087534748,27,0.0,0
2040,21,942.563016229748,28,0.0,0
2040,22,2198.390989008045,39,0.0,0
2040,23,38.755532680196005,17,0.0,0
2040,24,5.471369319196239,6,0.0,0
2040,25,8.10573232473517,8,0.0,0
2040,26,153.84953248060512,21,0.0,0
2040,27,358.63594983962076,37,0.0,0
2040,28,972.485651665613,26,0.0,0
2040,28,972.4856516656132,26,0.0,0
2040,29,2349.6972514094086,33,0.0,0
2040,30,376.5677473316019,37,0.0,0
2040,31,2627.9227668603858,37,0.0,0
Loading
Loading