diff --git a/Cargo.lock b/Cargo.lock index 82ba6cf7e..e42f98574 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.71.1" +version = "0.72.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" +checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" dependencies = [ "bitflags", "cexpr", @@ -322,18 +322,18 @@ dependencies = [ [[package]] name = "convert_case" -version = "0.8.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" dependencies = [ "unicode-segmentation", ] [[package]] name = "convert_case" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49" dependencies = [ "unicode-segmentation", ] @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "documented" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6b3e31251e87acd1b74911aed84071c8364fc9087972748ade2f1094ccce34" +checksum = "c278cf01d971a2ce2e4a97f2af1c13706e111c2c05636a88f93520b61c75b3cb" dependencies = [ "documented-macros", "phf", @@ -428,16 +428,16 @@ dependencies = [ [[package]] name = "documented-macros" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1149cf7462e5e79e17a3c05fd5b1f9055092bbfa95e04c319395c3beacc9370f" +checksum = "3605d4f0b4326a3a1909b6d258b47478c0d47bb668ad2cb7d4a6e2d22e852f5c" dependencies = [ - "convert_case 0.8.0", - "itertools 0.14.0", + "convert_case 0.11.0", + "itertools 0.15.0", "optfield", "proc-macro2", "quote", - "strum 0.27.2", + "strum", "syn", ] @@ -635,9 +635,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "highs" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85ad4b92e0e2d0340efe7961ccadd66312b9c87ff235df9556aa52fe99bf941" +checksum = "7dfc791427e78fdc1a0a37983f79c20f86a0b7b7dfdb5d6a57a6f72d77cd9074" dependencies = [ "highs-sys", "log", @@ -645,9 +645,9 @@ dependencies = [ [[package]] name = "highs-sys" -version = "1.12.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c51d1e4e682c01dd882d2d0cd89b6725cd5805dd307d290aac0a37be6fe0c58" +checksum = "e4da0c52322648e2360a5a8896d23301fa5ed99ed7607c5faf229bd0bbb30d3f" dependencies = [ "bindgen", "cmake", @@ -754,15 +754,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.15.0" @@ -937,7 +928,7 @@ dependencies = [ "rstest", "serde", "similar", - "strum 0.28.0", + "strum", "tempfile", "toml", "yaml-rust2", @@ -1051,9 +1042,9 @@ dependencies = [ [[package]] name = "phf" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "913273894cec178f401a31ec4b656318d95473527be05c0752cc41cdc32be8b7" +checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ "phf_macros", "phf_shared", @@ -1061,9 +1052,9 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cbb1126afed61dd6368748dae63b1ee7dc480191c6262a3b4ff1e29d86a6c5b" +checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", "phf_shared", @@ -1071,9 +1062,9 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d713258393a82f091ead52047ca779d37e5766226d009de21696c4e667044368" +checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ "phf_generator", "phf_shared", @@ -1084,9 +1075,9 @@ dependencies = [ [[package]] name = "phf_shared" -version = "0.12.1" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06005508882fb681fd97892ecff4b7fd0fee13ef1aa569f8695dae7ab9099981" +checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" dependencies = [ "siphasher", ] @@ -1406,34 +1397,13 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" -[[package]] -name = "strum" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" -dependencies = [ - "strum_macros 0.27.2", -] - [[package]] name = "strum" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9628de9b8791db39ceda2b119bbe13134770b56c138ec1d3af810d045c04f9bd" dependencies = [ - "strum_macros 0.28.0", -] - -[[package]] -name = "strum_macros" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn", + "strum_macros", ] [[package]] @@ -1514,9 +1484,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" +checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c" dependencies = [ "indexmap", "serde_core", @@ -1564,9 +1534,9 @@ dependencies = [ [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "typeid" diff --git a/Cargo.toml b/Cargo.toml index ec6c75eea..f3256b1da 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ platform-info = "2.1.0" derive_more = {version = "2.1", features = ["add", "add_assign", "not", "deref", "display", "sum", "from_str", "from", "into"]} petgraph = "0.8.3" strum = {version = "0.28.0", features = ["derive"]} -documented = "0.9.2" +documented = "0.10.0" dirs = "6.0.0" edit = "0.1.5" erased-serde = "0.4.10" diff --git a/tests/data/circularity/commodity_flows.csv b/tests/data/circularity/commodity_flows.csv index 2e04659d2..7eae013b3 100644 --- a/tests/data/circularity/commodity_flows.csv +++ b/tests/data/circularity/commodity_flows.csv @@ -625,8 +625,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2020,14,,RSHEAT,autumn.evening,11.435412867700338 2030,0,,GASPRD,winter.night,0.0 2030,0,,CO2EMT,winter.night,0.0 -2030,0,,GASPRD,winter.day,97.10394898688702 -2030,0,,CO2EMT,winter.day,496.4924911699534 +2030,0,,GASPRD,winter.day,97.10394898688696 +2030,0,,CO2EMT,winter.day,496.4924911699531 2030,0,,GASPRD,winter.peak,125.31875 2030,0,,CO2EMT,winter.peak,640.75476875 2030,0,,GASPRD,winter.evening,167.09166800339997 @@ -653,17 +653,17 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,0,,CO2EMT,autumn.day,0.0 2030,0,,GASPRD,autumn.peak,0.0 2030,0,,CO2EMT,autumn.peak,0.0 -2030,0,,GASPRD,autumn.evening,75.97058943140428 -2030,0,,CO2EMT,autumn.evening,388.4376237627701 -2030,1,,OILCRD,winter.night,126.73281307935001 -2030,1,,GASPRD,winter.night,12.673281307935001 -2030,1,,CO2EMT,winter.night,929.3317183108736 -2030,1,,OILCRD,winter.day,181.04687557935 -2030,1,,GASPRD,winter.day,18.104687557935 -2030,1,,CO2EMT,winter.day,1327.6167386233735 -2030,1,,OILCRD,winter.peak,54.3140625 -2030,1,,GASPRD,winter.peak,5.43140625 -2030,1,,CO2EMT,winter.peak,398.2850203125 +2030,0,,GASPRD,autumn.evening,75.97058943140429 +2030,0,,CO2EMT,autumn.evening,388.43762376277016 +2030,1,,OILCRD,winter.night,0.0 +2030,1,,GASPRD,winter.night,0.0 +2030,1,,CO2EMT,winter.night,0.0 +2030,1,,OILCRD,winter.day,0.0 +2030,1,,GASPRD,winter.day,0.0 +2030,1,,CO2EMT,winter.day,0.0 +2030,1,,OILCRD,winter.peak,19.58582842379529 +2030,1,,GASPRD,winter.peak,1.9585828423795293 +2030,1,,CO2EMT,winter.peak,143.62287983169088 2030,1,,OILCRD,winter.evening,72.41875057934999 2030,1,,GASPRD,winter.evening,7.241875057934999 2030,1,,CO2EMT,winter.evening,531.0466979983735 @@ -691,15 +691,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,1,,OILCRD,summer.evening,72.41875057934999 2030,1,,GASPRD,summer.evening,7.241875057934999 2030,1,,CO2EMT,summer.evening,531.0466979983735 -2030,1,,OILCRD,autumn.night,0.0 -2030,1,,GASPRD,autumn.night,0.0 -2030,1,,CO2EMT,autumn.night,0.0 -2030,1,,OILCRD,autumn.day,0.0 -2030,1,,GASPRD,autumn.day,0.0 -2030,1,,CO2EMT,autumn.day,0.0 -2030,1,,OILCRD,autumn.peak,19.58582842379529 -2030,1,,GASPRD,autumn.peak,1.9585828423795293 -2030,1,,CO2EMT,autumn.peak,143.62287983169088 +2030,1,,OILCRD,autumn.night,126.73281307935001 +2030,1,,GASPRD,autumn.night,12.673281307935001 +2030,1,,CO2EMT,autumn.night,929.3317183108736 +2030,1,,OILCRD,autumn.day,181.04687557935 +2030,1,,GASPRD,autumn.day,18.104687557935 +2030,1,,CO2EMT,autumn.day,1327.6167386233735 +2030,1,,OILCRD,autumn.peak,54.3140625 +2030,1,,GASPRD,autumn.peak,5.43140625 +2030,1,,CO2EMT,autumn.peak,398.2850203125 2030,1,,OILCRD,autumn.evening,72.41875057934999 2030,1,,GASPRD,autumn.evening,7.241875057934999 2030,1,,CO2EMT,autumn.evening,531.0466979983735 @@ -815,15 +815,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,6,,GASNAT,autumn.evening,-5.398315038937213 2030,6,,ELCTRI,autumn.evening,3.598876692624809 2030,6,,CO2EMT,autumn.evening,276.0158479408597 -2030,13,,GASNAT,winter.night,-43.845148578709995 -2030,13,,RSHEAT,winter.night,38.1262161554 -2030,13,,CO2EMT,winter.night,2241.8024468294425 +2030,13,,GASNAT,winter.night,-29.47086732871 +2030,13,,RSHEAT,winter.night,25.6268411554 +2030,13,,CO2EMT,winter.night,1506.8454465169425 2030,13,,GASNAT,winter.day,-219.27676569358 2030,13,,RSHEAT,winter.day,190.6754484292 2030,13,,CO2EMT,winter.day,11211.621029912745 -2030,13,,GASNAT,winter.peak,-89.84446874999999 -2030,13,,RSHEAT,winter.peak,78.125625 -2030,13,,CO2EMT,winter.peak,4593.747687187501 +2030,13,,GASNAT,winter.peak,-104.21874999999999 +2030,13,,RSHEAT,winter.peak,90.625 +2030,13,,CO2EMT,winter.peak,5328.704687500001 2030,13,,GASNAT,winter.evening,-71.44063561968 2030,13,,RSHEAT,winter.evening,62.1222918432 2030,13,,CO2EMT,winter.evening,3652.7596992342387 @@ -833,12 +833,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,13,,GASNAT,peak.day,-96.21279149075198 2030,13,,RSHEAT,peak.day,83.66329694848 2030,13,,CO2EMT,peak.day,4919.3600289221495 -2030,13,,GASNAT,peak.peak,-66.12685298630602 -2030,13,,RSHEAT,peak.peak,57.50161129244002 -2030,13,,CO2EMT,peak.peak,3381.0659931898267 -2030,13,,GASNAT,peak.evening,-2.508276216777985 -2030,13,,RSHEAT,peak.evening,2.181109753719987 -2030,13,,CO2EMT,peak.evening,128.2481629638584 +2030,13,,GASNAT,peak.peak,-38.96462902512 +2030,13,,RSHEAT,peak.peak,33.8822861088 +2030,13,,CO2EMT,peak.peak,1992.2614820543859 +2030,13,,GASNAT,peak.evening,-29.670500177964005 +2030,13,,RSHEAT,peak.evening,25.800434937360006 +2030,13,,CO2EMT,peak.evening,1517.0526740992998 2030,13,,GASNAT,summer.night,-0.0 2030,13,,RSHEAT,summer.night,0.0 2030,13,,CO2EMT,summer.night,0.0 @@ -854,15 +854,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,13,,GASNAT,autumn.night,-10.492917792587003 2030,13,,RSHEAT,autumn.night,9.124276341380003 2030,13,,CO2EMT,autumn.night,536.5028867349736 -2030,13,,GASNAT,autumn.day,-60.188217279196984 -2030,13,,RSHEAT,autumn.day,52.33758024277999 -2030,13,,CO2EMT,autumn.day,3077.4235494853424 +2030,13,,GASNAT,autumn.day,-40.812002698849994 +2030,13,,RSHEAT,autumn.day,35.488697998999996 +2030,13,,CO2EMT,autumn.day,2086.7176979922 2030,13,,GASNAT,autumn.peak,-50.017432516103 2030,13,,RSHEAT,autumn.peak,43.49341957922 2030,13,,CO2EMT,autumn.peak,2557.391324548347 -2030,13,,GASNAT,autumn.evening,-0.0 -2030,13,,RSHEAT,autumn.evening,0.0 -2030,13,,CO2EMT,autumn.evening,0.0 +2030,13,,GASNAT,autumn.evening,-19.376214580347 +2030,13,,RSHEAT,autumn.evening,16.84888224378 +2030,13,,CO2EMT,autumn.evening,990.7058514931422 2030,14,,ELCTRI,winter.night,-9.624518793997803 2030,14,,RSHEAT,winter.night,29.165208466660005 2030,14,,ELCTRI,winter.day,-13.749312543997803 @@ -943,22 +943,22 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,15,,DIESEL,autumn.evening,-71.97229108719722 2030,15,,TPASKM,autumn.evening,32.3875309924775 2030,15,,CO2EMT,autumn.evening,4988.399495032756 -2030,16,,BIOPEL,winter.night,-0.0 -2030,16,,RSHEAT,winter.night,0.0 +2030,16,,BIOPEL,winter.night,-14.999250000000004 +2030,16,,RSHEAT,winter.night,12.499375000000004 2030,16,,BIOPEL,winter.day,-0.0 2030,16,,RSHEAT,winter.day,0.0 -2030,16,,BIOPEL,winter.peak,-28.343190220368022 -2030,16,,RSHEAT,winter.peak,23.61932518364002 +2030,16,,BIOPEL,winter.peak,-13.343940220368017 +2030,16,,RSHEAT,winter.peak,11.119950183640015 2030,16,,BIOPEL,winter.evening,-0.0 2030,16,,RSHEAT,winter.evening,0.0 2030,16,,BIOPEL,peak.night,-0.0 2030,16,,RSHEAT,peak.night,0.0 2030,16,,BIOPEL,peak.day,-0.0 2030,16,,RSHEAT,peak.day,0.0 -2030,16,,BIOPEL,peak.peak,-0.0 -2030,16,,RSHEAT,peak.peak,0.0 -2030,16,,BIOPEL,peak.evening,-28.343190220368022 -2030,16,,RSHEAT,peak.evening,23.61932518364002 +2030,16,,BIOPEL,peak.peak,-28.343190220368022 +2030,16,,RSHEAT,peak.peak,23.61932518364002 +2030,16,,BIOPEL,peak.evening,-0.0 +2030,16,,RSHEAT,peak.evening,0.0 2030,16,,BIOPEL,summer.night,-1.073113352519217 2030,16,,RSHEAT,summer.night,0.8942611270993475 2030,16,,BIOPEL,summer.day,-0.0 @@ -969,12 +969,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,16,,RSHEAT,summer.evening,0.0 2030,16,,BIOPEL,autumn.night,-0.0 2030,16,,RSHEAT,autumn.night,0.0 -2030,16,,BIOPEL,autumn.day,-8.124531527832023 -2030,16,,RSHEAT,autumn.day,6.770442939860019 +2030,16,,BIOPEL,autumn.day,-28.343190220368022 +2030,16,,RSHEAT,autumn.day,23.61932518364002 2030,16,,BIOPEL,autumn.peak,-0.0 2030,16,,RSHEAT,autumn.peak,0.0 -2030,16,,BIOPEL,autumn.evening,-20.218658692536 -2030,16,,RSHEAT,autumn.evening,16.84888224378 +2030,16,,BIOPEL,autumn.evening,-0.0 +2030,16,,RSHEAT,autumn.evening,0.0 2030,17,,OILCRD,winter.night,-348.85069558626907 2030,17,,GASOLI,winter.night,134.17334445625733 2030,17,,DIESEL,winter.night,134.17334445625733 @@ -1071,12 +1071,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,18,,BIOPEL,autumn.peak,3.542898763374408 2030,18,,BIOPRD,autumn.evening,-4.960058308404636 2030,18,,BIOPEL,autumn.evening,4.723865055623463 -2030,19,,OILCRD,winter.night,0.0 -2030,19,,GASPRD,winter.night,0.0 -2030,19,,CO2EMT,winter.night,0.0 -2030,19,,OILCRD,winter.day,178.85135816024555 -2030,19,,GASPRD,winter.day,17.885135816024555 -2030,19,,CO2EMT,winter.day,1311.5170093890806 +2030,19,,OILCRD,winter.night,214.6773511300117 +2030,19,,GASPRD,winter.night,21.46773511300117 +2030,19,,CO2EMT,winter.night,1574.2290158363758 +2030,19,,OILCRD,winter.day,306.68192976513865 +2030,19,,GASPRD,winter.day,30.668192976513865 +2030,19,,CO2EMT,winter.day,2248.8985909677617 2030,19,,OILCRD,winter.peak,92.00457863512693 2030,19,,GASPRD,winter.peak,9.200457863512694 2030,19,,CO2EMT,winter.peak,674.6695751313858 @@ -1107,12 +1107,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,19,,OILCRD,summer.evening,122.67277249488474 2030,19,,GASPRD,summer.evening,12.267277249488474 2030,19,,CO2EMT,summer.evening,899.5594407049898 -2030,19,,OILCRD,autumn.night,214.6773511300117 -2030,19,,GASPRD,autumn.night,21.46773511300117 -2030,19,,CO2EMT,autumn.night,1574.2290158363758 -2030,19,,OILCRD,autumn.day,306.68192976513865 -2030,19,,GASPRD,autumn.day,30.668192976513865 -2030,19,,CO2EMT,autumn.day,2248.8985909677617 +2030,19,,OILCRD,autumn.night,0.0 +2030,19,,GASPRD,autumn.night,0.0 +2030,19,,CO2EMT,autumn.night,0.0 +2030,19,,OILCRD,autumn.day,178.85135816024555 +2030,19,,GASPRD,autumn.day,17.885135816024555 +2030,19,,CO2EMT,autumn.day,1311.5170093890806 2030,19,,OILCRD,autumn.peak,92.00457863512693 2030,19,,GASPRD,autumn.peak,9.200457863512694 2030,19,,CO2EMT,autumn.peak,674.6695751313858 diff --git a/tests/data/circularity/commodity_prices.csv b/tests/data/circularity/commodity_prices.csv index 820cb50dd..c693ea789 100644 --- a/tests/data/circularity/commodity_prices.csv +++ b/tests/data/circularity/commodity_prices.csv @@ -175,10 +175,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,51.786792011459774 2020,RSHEAT,GBR,autumn.peak,55.10110597011735 2020,RSHEAT,GBR,autumn.evening,51.491109338557344 -2030,GASPRD,GBR,winter.night,10.559983580377997 -2030,GASPRD,GBR,winter.day,10.559983580377997 -2030,GASPRD,GBR,winter.peak,10.559983580377997 -2030,GASPRD,GBR,winter.evening,10.559983580377997 +2030,GASPRD,GBR,winter.night,10.377786289511276 +2030,GASPRD,GBR,winter.day,10.377786289511276 +2030,GASPRD,GBR,winter.peak,10.377786289511276 +2030,GASPRD,GBR,winter.evening,10.377786289511276 2030,GASPRD,GBR,peak.night,9.23983765468024 2030,GASPRD,GBR,peak.day,9.23983765468024 2030,GASPRD,GBR,peak.peak,9.23983765468024 @@ -187,14 +187,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASPRD,GBR,summer.day,5.436112004100912 2030,GASPRD,GBR,summer.peak,5.436112004100912 2030,GASPRD,GBR,summer.evening,5.436112004100912 -2030,GASPRD,GBR,autumn.night,8.3032576034986 -2030,GASPRD,GBR,autumn.day,8.3032576034986 -2030,GASPRD,GBR,autumn.peak,8.3032576034986 -2030,GASPRD,GBR,autumn.evening,8.3032576034986 -2030,OILCRD,GBR,winter.night,6.475373671403247 -2030,OILCRD,GBR,winter.day,6.475373671403247 -2030,OILCRD,GBR,winter.peak,6.475373671403247 -2030,OILCRD,GBR,winter.evening,6.475373671403247 +2030,GASPRD,GBR,autumn.night,8.845252916651935 +2030,GASPRD,GBR,autumn.day,8.845252916651935 +2030,GASPRD,GBR,autumn.peak,8.845252916651935 +2030,GASPRD,GBR,autumn.evening,8.845252916651935 +2030,OILCRD,GBR,winter.night,5.436112004100913 +2030,OILCRD,GBR,winter.day,5.436112004100913 +2030,OILCRD,GBR,winter.peak,5.436112004100913 +2030,OILCRD,GBR,winter.evening,5.436112004100913 2030,OILCRD,GBR,peak.night,5.436112004100913 2030,OILCRD,GBR,peak.day,5.436112004100913 2030,OILCRD,GBR,peak.peak,5.436112004100913 @@ -203,10 +203,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,OILCRD,GBR,summer.day,5.436112004100913 2030,OILCRD,GBR,summer.peak,5.436112004100913 2030,OILCRD,GBR,summer.evening,5.436112004100913 -2030,OILCRD,GBR,autumn.night,5.436112004100913 -2030,OILCRD,GBR,autumn.day,5.436112004100913 -2030,OILCRD,GBR,autumn.peak,5.436112004100913 -2030,OILCRD,GBR,autumn.evening,5.436112004100913 +2030,OILCRD,GBR,autumn.night,6.475373671403247 +2030,OILCRD,GBR,autumn.day,6.475373671403247 +2030,OILCRD,GBR,autumn.peak,6.475373671403247 +2030,OILCRD,GBR,autumn.evening,6.475373671403247 2030,BIOPRD,GBR,winter.night,0.659047214264789 2030,BIOPRD,GBR,winter.day,0.659047214264789 2030,BIOPRD,GBR,winter.peak,0.659047214264789 @@ -223,10 +223,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,BIOPRD,GBR,autumn.day,0.659047214264789 2030,BIOPRD,GBR,autumn.peak,0.659047214264789 2030,BIOPRD,GBR,autumn.evening,0.659047214264789 -2030,GASNAT,GBR,winter.night,16.24158508292405 -2030,GASNAT,GBR,winter.day,16.24158508292405 -2030,GASNAT,GBR,winter.peak,16.24158508292405 -2030,GASNAT,GBR,winter.evening,16.24158508292405 +2030,GASNAT,GBR,winter.night,16.050277927513992 +2030,GASNAT,GBR,winter.day,16.050277927513992 +2030,GASNAT,GBR,winter.peak,16.050277927513992 +2030,GASNAT,GBR,winter.evening,16.050277927513992 2030,GASNAT,GBR,peak.night,14.855431860941405 2030,GASNAT,GBR,peak.day,14.855431860941405 2030,GASNAT,GBR,peak.peak,14.855431860941405 @@ -235,14 +235,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,summer.day,10.861519927833113 2030,GASNAT,GBR,summer.peak,10.861519927833113 2030,GASNAT,GBR,summer.evening,10.861519927833113 -2030,GASNAT,GBR,autumn.night,13.872022807200683 -2030,GASNAT,GBR,autumn.day,13.872022807200683 -2030,GASNAT,GBR,autumn.peak,13.872022807200683 -2030,GASNAT,GBR,autumn.evening,13.872022807200683 -2030,GASOLI,GBR,winter.night,11.780130704005755 -2030,GASOLI,GBR,winter.day,11.780130704005755 -2030,GASOLI,GBR,winter.peak,11.780130704005755 -2030,GASOLI,GBR,winter.evening,11.780130704005755 +2030,GASNAT,GBR,autumn.night,14.441117886011686 +2030,GASNAT,GBR,autumn.day,14.441117886011686 +2030,GASNAT,GBR,autumn.peak,14.441117886011686 +2030,GASNAT,GBR,autumn.evening,14.441117886011686 +2030,GASOLI,GBR,winter.night,10.429090536512719 +2030,GASOLI,GBR,winter.day,10.429090536512719 +2030,GASOLI,GBR,winter.peak,10.429090536512719 +2030,GASOLI,GBR,winter.evening,10.429090536512719 2030,GASOLI,GBR,peak.night,10.429090536512719 2030,GASOLI,GBR,peak.day,10.429090536512719 2030,GASOLI,GBR,peak.peak,10.429090536512719 @@ -251,14 +251,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASOLI,GBR,summer.day,10.429090536512719 2030,GASOLI,GBR,summer.peak,10.429090536512719 2030,GASOLI,GBR,summer.evening,10.429090536512719 -2030,GASOLI,GBR,autumn.night,10.429090536512719 -2030,GASOLI,GBR,autumn.day,10.429090536512719 -2030,GASOLI,GBR,autumn.peak,10.429090536512719 -2030,GASOLI,GBR,autumn.evening,10.429090536512719 -2030,DIESEL,GBR,winter.night,11.780130704005755 -2030,DIESEL,GBR,winter.day,11.780130704005755 -2030,DIESEL,GBR,winter.peak,11.780130704005755 -2030,DIESEL,GBR,winter.evening,11.780130704005755 +2030,GASOLI,GBR,autumn.night,11.780130704005755 +2030,GASOLI,GBR,autumn.day,11.780130704005755 +2030,GASOLI,GBR,autumn.peak,11.780130704005755 +2030,GASOLI,GBR,autumn.evening,11.780130704005755 +2030,DIESEL,GBR,winter.night,10.429090536512719 +2030,DIESEL,GBR,winter.day,10.429090536512719 +2030,DIESEL,GBR,winter.peak,10.429090536512719 +2030,DIESEL,GBR,winter.evening,10.429090536512719 2030,DIESEL,GBR,peak.night,10.429090536512719 2030,DIESEL,GBR,peak.day,10.429090536512719 2030,DIESEL,GBR,peak.peak,10.429090536512719 @@ -267,10 +267,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,DIESEL,GBR,summer.day,10.429090536512719 2030,DIESEL,GBR,summer.peak,10.429090536512719 2030,DIESEL,GBR,summer.evening,10.429090536512719 -2030,DIESEL,GBR,autumn.night,10.429090536512719 -2030,DIESEL,GBR,autumn.day,10.429090536512719 -2030,DIESEL,GBR,autumn.peak,10.429090536512719 -2030,DIESEL,GBR,autumn.evening,10.429090536512719 +2030,DIESEL,GBR,autumn.night,11.780130704005755 +2030,DIESEL,GBR,autumn.day,11.780130704005755 +2030,DIESEL,GBR,autumn.peak,11.780130704005755 +2030,DIESEL,GBR,autumn.evening,11.780130704005755 2030,BIOPEL,GBR,winter.night,1.5509989172586045 2030,BIOPEL,GBR,winter.day,1.5509989172586045 2030,BIOPEL,GBR,winter.peak,1.5509989172586045 @@ -287,10 +287,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,BIOPEL,GBR,autumn.day,1.5509989172586045 2030,BIOPEL,GBR,autumn.peak,1.5509989172586045 2030,BIOPEL,GBR,autumn.evening,1.5509989172586045 -2030,ELCTRI,GBR,winter.night,23.26642826979609 -2030,ELCTRI,GBR,winter.day,22.137508549856886 -2030,ELCTRI,GBR,winter.peak,22.90804104164442 -2030,ELCTRI,GBR,winter.evening,23.13203306172587 +2030,ELCTRI,GBR,winter.night,23.11170901686785 +2030,ELCTRI,GBR,winter.day,21.9982174697757 +2030,ELCTRI,GBR,winter.peak,22.758219621577485 +2030,ELCTRI,GBR,winter.evening,22.97915049608664 2030,ELCTRI,GBR,peak.night,25.2590488266312 2030,ELCTRI,GBR,peak.day,22.096944951159674 2030,ELCTRI,GBR,peak.peak,22.710453072104144 @@ -299,10 +299,10 @@ milestone_year,commodity_id,region_id,time_slice,price 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.582963633474225 -2030,ELCTRI,GBR,autumn.day,21.77430345105983 -2030,ELCTRI,GBR,autumn.peak,22.83865903743826 -2030,ELCTRI,GBR,autumn.evening,23.359672246400482 +2030,ELCTRI,GBR,autumn.night,24.152492558732824 +2030,ELCTRI,GBR,autumn.day,22.255320033076842 +2030,ELCTRI,GBR,autumn.peak,23.37176313037005 +2030,ELCTRI,GBR,autumn.evening,23.91827372155667 2030,H2YPRD,GBR,winter.night,13.916975257940608 2030,H2YPRD,GBR,winter.day,13.916975257940608 2030,H2YPRD,GBR,winter.peak,13.916975257940608 @@ -319,10 +319,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,H2YPRD,GBR,autumn.day,13.916975257940608 2030,H2YPRD,GBR,autumn.peak,13.916975257940608 2030,H2YPRD,GBR,autumn.evening,13.916975257940608 -2030,TPASKM,GBR,winter.night,33.067791460070815 -2030,TPASKM,GBR,winter.day,33.067791460070815 -2030,TPASKM,GBR,winter.peak,33.067791460070815 -2030,TPASKM,GBR,winter.evening,33.067791460070815 +2030,TPASKM,GBR,winter.night,30.065479977053187 +2030,TPASKM,GBR,winter.day,30.065479977053187 +2030,TPASKM,GBR,winter.peak,30.065479977053187 +2030,TPASKM,GBR,winter.evening,30.065479977053187 2030,TPASKM,GBR,peak.night,30.065479977053187 2030,TPASKM,GBR,peak.day,30.065479977053187 2030,TPASKM,GBR,peak.peak,30.065479977053187 @@ -331,23 +331,23 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,TPASKM,GBR,summer.day,30.065479977053187 2030,TPASKM,GBR,summer.peak,30.065479977053187 2030,TPASKM,GBR,summer.evening,30.065479977053187 -2030,TPASKM,GBR,autumn.night,30.065479977053187 -2030,TPASKM,GBR,autumn.day,30.065479977053187 -2030,TPASKM,GBR,autumn.peak,30.065479977053187 -2030,TPASKM,GBR,autumn.evening,30.065479977053187 -2030,RSHEAT,GBR,winter.night,50.7485914542341 -2030,RSHEAT,GBR,winter.day,57.36057491973136 -2030,RSHEAT,GBR,winter.peak,89.97862601394866 -2030,RSHEAT,GBR,winter.evening,56.57158566250437 -2030,RSHEAT,GBR,peak.night,45.67732797556481 -2030,RSHEAT,GBR,peak.day,52.21020833373993 -2030,RSHEAT,GBR,peak.peak,56.10531485966301 -2030,RSHEAT,GBR,peak.evening,134.62039522330141 +2030,TPASKM,GBR,autumn.night,33.067791460070815 +2030,TPASKM,GBR,autumn.day,33.067791460070815 +2030,TPASKM,GBR,autumn.peak,33.067791460070815 +2030,TPASKM,GBR,autumn.evening,33.067791460070815 +2030,RSHEAT,GBR,winter.night,78.24894220245585 +2030,RSHEAT,GBR,winter.day,57.17178106217242 +2030,RSHEAT,GBR,winter.peak,73.53824144649826 +2030,RSHEAT,GBR,winter.evening,56.387447293948604 +2030,RSHEAT,GBR,peak.night,45.6773279755648 +2030,RSHEAT,GBR,peak.day,52.210208333739914 +2030,RSHEAT,GBR,peak.peak,106.78988305727464 +2030,RSHEAT,GBR,peak.evening,51.07244300192399 2030,RSHEAT,GBR,summer.night,59.40752206555305 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,41.54976285464197 -2030,RSHEAT,GBR,autumn.day,59.63965318459326 -2030,RSHEAT,GBR,autumn.peak,54.12510715585182 -2030,RSHEAT,GBR,autumn.evening,123.80169309625555 +2030,RSHEAT,GBR,autumn.night,41.84887656119677 +2030,RSHEAT,GBR,autumn.day,85.24030121983449 +2030,RSHEAT,GBR,autumn.peak,54.67274224641541 +2030,RSHEAT,GBR,autumn.evening,48.13626193972428 diff --git a/tests/data/circularity_npv/commodity_flows.csv b/tests/data/circularity_npv/commodity_flows.csv index 2e04659d2..7eae013b3 100644 --- a/tests/data/circularity_npv/commodity_flows.csv +++ b/tests/data/circularity_npv/commodity_flows.csv @@ -625,8 +625,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2020,14,,RSHEAT,autumn.evening,11.435412867700338 2030,0,,GASPRD,winter.night,0.0 2030,0,,CO2EMT,winter.night,0.0 -2030,0,,GASPRD,winter.day,97.10394898688702 -2030,0,,CO2EMT,winter.day,496.4924911699534 +2030,0,,GASPRD,winter.day,97.10394898688696 +2030,0,,CO2EMT,winter.day,496.4924911699531 2030,0,,GASPRD,winter.peak,125.31875 2030,0,,CO2EMT,winter.peak,640.75476875 2030,0,,GASPRD,winter.evening,167.09166800339997 @@ -653,17 +653,17 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,0,,CO2EMT,autumn.day,0.0 2030,0,,GASPRD,autumn.peak,0.0 2030,0,,CO2EMT,autumn.peak,0.0 -2030,0,,GASPRD,autumn.evening,75.97058943140428 -2030,0,,CO2EMT,autumn.evening,388.4376237627701 -2030,1,,OILCRD,winter.night,126.73281307935001 -2030,1,,GASPRD,winter.night,12.673281307935001 -2030,1,,CO2EMT,winter.night,929.3317183108736 -2030,1,,OILCRD,winter.day,181.04687557935 -2030,1,,GASPRD,winter.day,18.104687557935 -2030,1,,CO2EMT,winter.day,1327.6167386233735 -2030,1,,OILCRD,winter.peak,54.3140625 -2030,1,,GASPRD,winter.peak,5.43140625 -2030,1,,CO2EMT,winter.peak,398.2850203125 +2030,0,,GASPRD,autumn.evening,75.97058943140429 +2030,0,,CO2EMT,autumn.evening,388.43762376277016 +2030,1,,OILCRD,winter.night,0.0 +2030,1,,GASPRD,winter.night,0.0 +2030,1,,CO2EMT,winter.night,0.0 +2030,1,,OILCRD,winter.day,0.0 +2030,1,,GASPRD,winter.day,0.0 +2030,1,,CO2EMT,winter.day,0.0 +2030,1,,OILCRD,winter.peak,19.58582842379529 +2030,1,,GASPRD,winter.peak,1.9585828423795293 +2030,1,,CO2EMT,winter.peak,143.62287983169088 2030,1,,OILCRD,winter.evening,72.41875057934999 2030,1,,GASPRD,winter.evening,7.241875057934999 2030,1,,CO2EMT,winter.evening,531.0466979983735 @@ -691,15 +691,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,1,,OILCRD,summer.evening,72.41875057934999 2030,1,,GASPRD,summer.evening,7.241875057934999 2030,1,,CO2EMT,summer.evening,531.0466979983735 -2030,1,,OILCRD,autumn.night,0.0 -2030,1,,GASPRD,autumn.night,0.0 -2030,1,,CO2EMT,autumn.night,0.0 -2030,1,,OILCRD,autumn.day,0.0 -2030,1,,GASPRD,autumn.day,0.0 -2030,1,,CO2EMT,autumn.day,0.0 -2030,1,,OILCRD,autumn.peak,19.58582842379529 -2030,1,,GASPRD,autumn.peak,1.9585828423795293 -2030,1,,CO2EMT,autumn.peak,143.62287983169088 +2030,1,,OILCRD,autumn.night,126.73281307935001 +2030,1,,GASPRD,autumn.night,12.673281307935001 +2030,1,,CO2EMT,autumn.night,929.3317183108736 +2030,1,,OILCRD,autumn.day,181.04687557935 +2030,1,,GASPRD,autumn.day,18.104687557935 +2030,1,,CO2EMT,autumn.day,1327.6167386233735 +2030,1,,OILCRD,autumn.peak,54.3140625 +2030,1,,GASPRD,autumn.peak,5.43140625 +2030,1,,CO2EMT,autumn.peak,398.2850203125 2030,1,,OILCRD,autumn.evening,72.41875057934999 2030,1,,GASPRD,autumn.evening,7.241875057934999 2030,1,,CO2EMT,autumn.evening,531.0466979983735 @@ -815,15 +815,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,6,,GASNAT,autumn.evening,-5.398315038937213 2030,6,,ELCTRI,autumn.evening,3.598876692624809 2030,6,,CO2EMT,autumn.evening,276.0158479408597 -2030,13,,GASNAT,winter.night,-43.845148578709995 -2030,13,,RSHEAT,winter.night,38.1262161554 -2030,13,,CO2EMT,winter.night,2241.8024468294425 +2030,13,,GASNAT,winter.night,-29.47086732871 +2030,13,,RSHEAT,winter.night,25.6268411554 +2030,13,,CO2EMT,winter.night,1506.8454465169425 2030,13,,GASNAT,winter.day,-219.27676569358 2030,13,,RSHEAT,winter.day,190.6754484292 2030,13,,CO2EMT,winter.day,11211.621029912745 -2030,13,,GASNAT,winter.peak,-89.84446874999999 -2030,13,,RSHEAT,winter.peak,78.125625 -2030,13,,CO2EMT,winter.peak,4593.747687187501 +2030,13,,GASNAT,winter.peak,-104.21874999999999 +2030,13,,RSHEAT,winter.peak,90.625 +2030,13,,CO2EMT,winter.peak,5328.704687500001 2030,13,,GASNAT,winter.evening,-71.44063561968 2030,13,,RSHEAT,winter.evening,62.1222918432 2030,13,,CO2EMT,winter.evening,3652.7596992342387 @@ -833,12 +833,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,13,,GASNAT,peak.day,-96.21279149075198 2030,13,,RSHEAT,peak.day,83.66329694848 2030,13,,CO2EMT,peak.day,4919.3600289221495 -2030,13,,GASNAT,peak.peak,-66.12685298630602 -2030,13,,RSHEAT,peak.peak,57.50161129244002 -2030,13,,CO2EMT,peak.peak,3381.0659931898267 -2030,13,,GASNAT,peak.evening,-2.508276216777985 -2030,13,,RSHEAT,peak.evening,2.181109753719987 -2030,13,,CO2EMT,peak.evening,128.2481629638584 +2030,13,,GASNAT,peak.peak,-38.96462902512 +2030,13,,RSHEAT,peak.peak,33.8822861088 +2030,13,,CO2EMT,peak.peak,1992.2614820543859 +2030,13,,GASNAT,peak.evening,-29.670500177964005 +2030,13,,RSHEAT,peak.evening,25.800434937360006 +2030,13,,CO2EMT,peak.evening,1517.0526740992998 2030,13,,GASNAT,summer.night,-0.0 2030,13,,RSHEAT,summer.night,0.0 2030,13,,CO2EMT,summer.night,0.0 @@ -854,15 +854,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,13,,GASNAT,autumn.night,-10.492917792587003 2030,13,,RSHEAT,autumn.night,9.124276341380003 2030,13,,CO2EMT,autumn.night,536.5028867349736 -2030,13,,GASNAT,autumn.day,-60.188217279196984 -2030,13,,RSHEAT,autumn.day,52.33758024277999 -2030,13,,CO2EMT,autumn.day,3077.4235494853424 +2030,13,,GASNAT,autumn.day,-40.812002698849994 +2030,13,,RSHEAT,autumn.day,35.488697998999996 +2030,13,,CO2EMT,autumn.day,2086.7176979922 2030,13,,GASNAT,autumn.peak,-50.017432516103 2030,13,,RSHEAT,autumn.peak,43.49341957922 2030,13,,CO2EMT,autumn.peak,2557.391324548347 -2030,13,,GASNAT,autumn.evening,-0.0 -2030,13,,RSHEAT,autumn.evening,0.0 -2030,13,,CO2EMT,autumn.evening,0.0 +2030,13,,GASNAT,autumn.evening,-19.376214580347 +2030,13,,RSHEAT,autumn.evening,16.84888224378 +2030,13,,CO2EMT,autumn.evening,990.7058514931422 2030,14,,ELCTRI,winter.night,-9.624518793997803 2030,14,,RSHEAT,winter.night,29.165208466660005 2030,14,,ELCTRI,winter.day,-13.749312543997803 @@ -943,22 +943,22 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,15,,DIESEL,autumn.evening,-71.97229108719722 2030,15,,TPASKM,autumn.evening,32.3875309924775 2030,15,,CO2EMT,autumn.evening,4988.399495032756 -2030,16,,BIOPEL,winter.night,-0.0 -2030,16,,RSHEAT,winter.night,0.0 +2030,16,,BIOPEL,winter.night,-14.999250000000004 +2030,16,,RSHEAT,winter.night,12.499375000000004 2030,16,,BIOPEL,winter.day,-0.0 2030,16,,RSHEAT,winter.day,0.0 -2030,16,,BIOPEL,winter.peak,-28.343190220368022 -2030,16,,RSHEAT,winter.peak,23.61932518364002 +2030,16,,BIOPEL,winter.peak,-13.343940220368017 +2030,16,,RSHEAT,winter.peak,11.119950183640015 2030,16,,BIOPEL,winter.evening,-0.0 2030,16,,RSHEAT,winter.evening,0.0 2030,16,,BIOPEL,peak.night,-0.0 2030,16,,RSHEAT,peak.night,0.0 2030,16,,BIOPEL,peak.day,-0.0 2030,16,,RSHEAT,peak.day,0.0 -2030,16,,BIOPEL,peak.peak,-0.0 -2030,16,,RSHEAT,peak.peak,0.0 -2030,16,,BIOPEL,peak.evening,-28.343190220368022 -2030,16,,RSHEAT,peak.evening,23.61932518364002 +2030,16,,BIOPEL,peak.peak,-28.343190220368022 +2030,16,,RSHEAT,peak.peak,23.61932518364002 +2030,16,,BIOPEL,peak.evening,-0.0 +2030,16,,RSHEAT,peak.evening,0.0 2030,16,,BIOPEL,summer.night,-1.073113352519217 2030,16,,RSHEAT,summer.night,0.8942611270993475 2030,16,,BIOPEL,summer.day,-0.0 @@ -969,12 +969,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,16,,RSHEAT,summer.evening,0.0 2030,16,,BIOPEL,autumn.night,-0.0 2030,16,,RSHEAT,autumn.night,0.0 -2030,16,,BIOPEL,autumn.day,-8.124531527832023 -2030,16,,RSHEAT,autumn.day,6.770442939860019 +2030,16,,BIOPEL,autumn.day,-28.343190220368022 +2030,16,,RSHEAT,autumn.day,23.61932518364002 2030,16,,BIOPEL,autumn.peak,-0.0 2030,16,,RSHEAT,autumn.peak,0.0 -2030,16,,BIOPEL,autumn.evening,-20.218658692536 -2030,16,,RSHEAT,autumn.evening,16.84888224378 +2030,16,,BIOPEL,autumn.evening,-0.0 +2030,16,,RSHEAT,autumn.evening,0.0 2030,17,,OILCRD,winter.night,-348.85069558626907 2030,17,,GASOLI,winter.night,134.17334445625733 2030,17,,DIESEL,winter.night,134.17334445625733 @@ -1071,12 +1071,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,18,,BIOPEL,autumn.peak,3.542898763374408 2030,18,,BIOPRD,autumn.evening,-4.960058308404636 2030,18,,BIOPEL,autumn.evening,4.723865055623463 -2030,19,,OILCRD,winter.night,0.0 -2030,19,,GASPRD,winter.night,0.0 -2030,19,,CO2EMT,winter.night,0.0 -2030,19,,OILCRD,winter.day,178.85135816024555 -2030,19,,GASPRD,winter.day,17.885135816024555 -2030,19,,CO2EMT,winter.day,1311.5170093890806 +2030,19,,OILCRD,winter.night,214.6773511300117 +2030,19,,GASPRD,winter.night,21.46773511300117 +2030,19,,CO2EMT,winter.night,1574.2290158363758 +2030,19,,OILCRD,winter.day,306.68192976513865 +2030,19,,GASPRD,winter.day,30.668192976513865 +2030,19,,CO2EMT,winter.day,2248.8985909677617 2030,19,,OILCRD,winter.peak,92.00457863512693 2030,19,,GASPRD,winter.peak,9.200457863512694 2030,19,,CO2EMT,winter.peak,674.6695751313858 @@ -1107,12 +1107,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,19,,OILCRD,summer.evening,122.67277249488474 2030,19,,GASPRD,summer.evening,12.267277249488474 2030,19,,CO2EMT,summer.evening,899.5594407049898 -2030,19,,OILCRD,autumn.night,214.6773511300117 -2030,19,,GASPRD,autumn.night,21.46773511300117 -2030,19,,CO2EMT,autumn.night,1574.2290158363758 -2030,19,,OILCRD,autumn.day,306.68192976513865 -2030,19,,GASPRD,autumn.day,30.668192976513865 -2030,19,,CO2EMT,autumn.day,2248.8985909677617 +2030,19,,OILCRD,autumn.night,0.0 +2030,19,,GASPRD,autumn.night,0.0 +2030,19,,CO2EMT,autumn.night,0.0 +2030,19,,OILCRD,autumn.day,178.85135816024555 +2030,19,,GASPRD,autumn.day,17.885135816024555 +2030,19,,CO2EMT,autumn.day,1311.5170093890806 2030,19,,OILCRD,autumn.peak,92.00457863512693 2030,19,,GASPRD,autumn.peak,9.200457863512694 2030,19,,CO2EMT,autumn.peak,674.6695751313858 diff --git a/tests/data/circularity_npv/commodity_prices.csv b/tests/data/circularity_npv/commodity_prices.csv index 820cb50dd..c693ea789 100644 --- a/tests/data/circularity_npv/commodity_prices.csv +++ b/tests/data/circularity_npv/commodity_prices.csv @@ -175,10 +175,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,51.786792011459774 2020,RSHEAT,GBR,autumn.peak,55.10110597011735 2020,RSHEAT,GBR,autumn.evening,51.491109338557344 -2030,GASPRD,GBR,winter.night,10.559983580377997 -2030,GASPRD,GBR,winter.day,10.559983580377997 -2030,GASPRD,GBR,winter.peak,10.559983580377997 -2030,GASPRD,GBR,winter.evening,10.559983580377997 +2030,GASPRD,GBR,winter.night,10.377786289511276 +2030,GASPRD,GBR,winter.day,10.377786289511276 +2030,GASPRD,GBR,winter.peak,10.377786289511276 +2030,GASPRD,GBR,winter.evening,10.377786289511276 2030,GASPRD,GBR,peak.night,9.23983765468024 2030,GASPRD,GBR,peak.day,9.23983765468024 2030,GASPRD,GBR,peak.peak,9.23983765468024 @@ -187,14 +187,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASPRD,GBR,summer.day,5.436112004100912 2030,GASPRD,GBR,summer.peak,5.436112004100912 2030,GASPRD,GBR,summer.evening,5.436112004100912 -2030,GASPRD,GBR,autumn.night,8.3032576034986 -2030,GASPRD,GBR,autumn.day,8.3032576034986 -2030,GASPRD,GBR,autumn.peak,8.3032576034986 -2030,GASPRD,GBR,autumn.evening,8.3032576034986 -2030,OILCRD,GBR,winter.night,6.475373671403247 -2030,OILCRD,GBR,winter.day,6.475373671403247 -2030,OILCRD,GBR,winter.peak,6.475373671403247 -2030,OILCRD,GBR,winter.evening,6.475373671403247 +2030,GASPRD,GBR,autumn.night,8.845252916651935 +2030,GASPRD,GBR,autumn.day,8.845252916651935 +2030,GASPRD,GBR,autumn.peak,8.845252916651935 +2030,GASPRD,GBR,autumn.evening,8.845252916651935 +2030,OILCRD,GBR,winter.night,5.436112004100913 +2030,OILCRD,GBR,winter.day,5.436112004100913 +2030,OILCRD,GBR,winter.peak,5.436112004100913 +2030,OILCRD,GBR,winter.evening,5.436112004100913 2030,OILCRD,GBR,peak.night,5.436112004100913 2030,OILCRD,GBR,peak.day,5.436112004100913 2030,OILCRD,GBR,peak.peak,5.436112004100913 @@ -203,10 +203,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,OILCRD,GBR,summer.day,5.436112004100913 2030,OILCRD,GBR,summer.peak,5.436112004100913 2030,OILCRD,GBR,summer.evening,5.436112004100913 -2030,OILCRD,GBR,autumn.night,5.436112004100913 -2030,OILCRD,GBR,autumn.day,5.436112004100913 -2030,OILCRD,GBR,autumn.peak,5.436112004100913 -2030,OILCRD,GBR,autumn.evening,5.436112004100913 +2030,OILCRD,GBR,autumn.night,6.475373671403247 +2030,OILCRD,GBR,autumn.day,6.475373671403247 +2030,OILCRD,GBR,autumn.peak,6.475373671403247 +2030,OILCRD,GBR,autumn.evening,6.475373671403247 2030,BIOPRD,GBR,winter.night,0.659047214264789 2030,BIOPRD,GBR,winter.day,0.659047214264789 2030,BIOPRD,GBR,winter.peak,0.659047214264789 @@ -223,10 +223,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,BIOPRD,GBR,autumn.day,0.659047214264789 2030,BIOPRD,GBR,autumn.peak,0.659047214264789 2030,BIOPRD,GBR,autumn.evening,0.659047214264789 -2030,GASNAT,GBR,winter.night,16.24158508292405 -2030,GASNAT,GBR,winter.day,16.24158508292405 -2030,GASNAT,GBR,winter.peak,16.24158508292405 -2030,GASNAT,GBR,winter.evening,16.24158508292405 +2030,GASNAT,GBR,winter.night,16.050277927513992 +2030,GASNAT,GBR,winter.day,16.050277927513992 +2030,GASNAT,GBR,winter.peak,16.050277927513992 +2030,GASNAT,GBR,winter.evening,16.050277927513992 2030,GASNAT,GBR,peak.night,14.855431860941405 2030,GASNAT,GBR,peak.day,14.855431860941405 2030,GASNAT,GBR,peak.peak,14.855431860941405 @@ -235,14 +235,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASNAT,GBR,summer.day,10.861519927833113 2030,GASNAT,GBR,summer.peak,10.861519927833113 2030,GASNAT,GBR,summer.evening,10.861519927833113 -2030,GASNAT,GBR,autumn.night,13.872022807200683 -2030,GASNAT,GBR,autumn.day,13.872022807200683 -2030,GASNAT,GBR,autumn.peak,13.872022807200683 -2030,GASNAT,GBR,autumn.evening,13.872022807200683 -2030,GASOLI,GBR,winter.night,11.780130704005755 -2030,GASOLI,GBR,winter.day,11.780130704005755 -2030,GASOLI,GBR,winter.peak,11.780130704005755 -2030,GASOLI,GBR,winter.evening,11.780130704005755 +2030,GASNAT,GBR,autumn.night,14.441117886011686 +2030,GASNAT,GBR,autumn.day,14.441117886011686 +2030,GASNAT,GBR,autumn.peak,14.441117886011686 +2030,GASNAT,GBR,autumn.evening,14.441117886011686 +2030,GASOLI,GBR,winter.night,10.429090536512719 +2030,GASOLI,GBR,winter.day,10.429090536512719 +2030,GASOLI,GBR,winter.peak,10.429090536512719 +2030,GASOLI,GBR,winter.evening,10.429090536512719 2030,GASOLI,GBR,peak.night,10.429090536512719 2030,GASOLI,GBR,peak.day,10.429090536512719 2030,GASOLI,GBR,peak.peak,10.429090536512719 @@ -251,14 +251,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,GASOLI,GBR,summer.day,10.429090536512719 2030,GASOLI,GBR,summer.peak,10.429090536512719 2030,GASOLI,GBR,summer.evening,10.429090536512719 -2030,GASOLI,GBR,autumn.night,10.429090536512719 -2030,GASOLI,GBR,autumn.day,10.429090536512719 -2030,GASOLI,GBR,autumn.peak,10.429090536512719 -2030,GASOLI,GBR,autumn.evening,10.429090536512719 -2030,DIESEL,GBR,winter.night,11.780130704005755 -2030,DIESEL,GBR,winter.day,11.780130704005755 -2030,DIESEL,GBR,winter.peak,11.780130704005755 -2030,DIESEL,GBR,winter.evening,11.780130704005755 +2030,GASOLI,GBR,autumn.night,11.780130704005755 +2030,GASOLI,GBR,autumn.day,11.780130704005755 +2030,GASOLI,GBR,autumn.peak,11.780130704005755 +2030,GASOLI,GBR,autumn.evening,11.780130704005755 +2030,DIESEL,GBR,winter.night,10.429090536512719 +2030,DIESEL,GBR,winter.day,10.429090536512719 +2030,DIESEL,GBR,winter.peak,10.429090536512719 +2030,DIESEL,GBR,winter.evening,10.429090536512719 2030,DIESEL,GBR,peak.night,10.429090536512719 2030,DIESEL,GBR,peak.day,10.429090536512719 2030,DIESEL,GBR,peak.peak,10.429090536512719 @@ -267,10 +267,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,DIESEL,GBR,summer.day,10.429090536512719 2030,DIESEL,GBR,summer.peak,10.429090536512719 2030,DIESEL,GBR,summer.evening,10.429090536512719 -2030,DIESEL,GBR,autumn.night,10.429090536512719 -2030,DIESEL,GBR,autumn.day,10.429090536512719 -2030,DIESEL,GBR,autumn.peak,10.429090536512719 -2030,DIESEL,GBR,autumn.evening,10.429090536512719 +2030,DIESEL,GBR,autumn.night,11.780130704005755 +2030,DIESEL,GBR,autumn.day,11.780130704005755 +2030,DIESEL,GBR,autumn.peak,11.780130704005755 +2030,DIESEL,GBR,autumn.evening,11.780130704005755 2030,BIOPEL,GBR,winter.night,1.5509989172586045 2030,BIOPEL,GBR,winter.day,1.5509989172586045 2030,BIOPEL,GBR,winter.peak,1.5509989172586045 @@ -287,10 +287,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,BIOPEL,GBR,autumn.day,1.5509989172586045 2030,BIOPEL,GBR,autumn.peak,1.5509989172586045 2030,BIOPEL,GBR,autumn.evening,1.5509989172586045 -2030,ELCTRI,GBR,winter.night,23.26642826979609 -2030,ELCTRI,GBR,winter.day,22.137508549856886 -2030,ELCTRI,GBR,winter.peak,22.90804104164442 -2030,ELCTRI,GBR,winter.evening,23.13203306172587 +2030,ELCTRI,GBR,winter.night,23.11170901686785 +2030,ELCTRI,GBR,winter.day,21.9982174697757 +2030,ELCTRI,GBR,winter.peak,22.758219621577485 +2030,ELCTRI,GBR,winter.evening,22.97915049608664 2030,ELCTRI,GBR,peak.night,25.2590488266312 2030,ELCTRI,GBR,peak.day,22.096944951159674 2030,ELCTRI,GBR,peak.peak,22.710453072104144 @@ -299,10 +299,10 @@ milestone_year,commodity_id,region_id,time_slice,price 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.582963633474225 -2030,ELCTRI,GBR,autumn.day,21.77430345105983 -2030,ELCTRI,GBR,autumn.peak,22.83865903743826 -2030,ELCTRI,GBR,autumn.evening,23.359672246400482 +2030,ELCTRI,GBR,autumn.night,24.152492558732824 +2030,ELCTRI,GBR,autumn.day,22.255320033076842 +2030,ELCTRI,GBR,autumn.peak,23.37176313037005 +2030,ELCTRI,GBR,autumn.evening,23.91827372155667 2030,H2YPRD,GBR,winter.night,13.916975257940608 2030,H2YPRD,GBR,winter.day,13.916975257940608 2030,H2YPRD,GBR,winter.peak,13.916975257940608 @@ -319,10 +319,10 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,H2YPRD,GBR,autumn.day,13.916975257940608 2030,H2YPRD,GBR,autumn.peak,13.916975257940608 2030,H2YPRD,GBR,autumn.evening,13.916975257940608 -2030,TPASKM,GBR,winter.night,33.067791460070815 -2030,TPASKM,GBR,winter.day,33.067791460070815 -2030,TPASKM,GBR,winter.peak,33.067791460070815 -2030,TPASKM,GBR,winter.evening,33.067791460070815 +2030,TPASKM,GBR,winter.night,30.065479977053187 +2030,TPASKM,GBR,winter.day,30.065479977053187 +2030,TPASKM,GBR,winter.peak,30.065479977053187 +2030,TPASKM,GBR,winter.evening,30.065479977053187 2030,TPASKM,GBR,peak.night,30.065479977053187 2030,TPASKM,GBR,peak.day,30.065479977053187 2030,TPASKM,GBR,peak.peak,30.065479977053187 @@ -331,23 +331,23 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,TPASKM,GBR,summer.day,30.065479977053187 2030,TPASKM,GBR,summer.peak,30.065479977053187 2030,TPASKM,GBR,summer.evening,30.065479977053187 -2030,TPASKM,GBR,autumn.night,30.065479977053187 -2030,TPASKM,GBR,autumn.day,30.065479977053187 -2030,TPASKM,GBR,autumn.peak,30.065479977053187 -2030,TPASKM,GBR,autumn.evening,30.065479977053187 -2030,RSHEAT,GBR,winter.night,50.7485914542341 -2030,RSHEAT,GBR,winter.day,57.36057491973136 -2030,RSHEAT,GBR,winter.peak,89.97862601394866 -2030,RSHEAT,GBR,winter.evening,56.57158566250437 -2030,RSHEAT,GBR,peak.night,45.67732797556481 -2030,RSHEAT,GBR,peak.day,52.21020833373993 -2030,RSHEAT,GBR,peak.peak,56.10531485966301 -2030,RSHEAT,GBR,peak.evening,134.62039522330141 +2030,TPASKM,GBR,autumn.night,33.067791460070815 +2030,TPASKM,GBR,autumn.day,33.067791460070815 +2030,TPASKM,GBR,autumn.peak,33.067791460070815 +2030,TPASKM,GBR,autumn.evening,33.067791460070815 +2030,RSHEAT,GBR,winter.night,78.24894220245585 +2030,RSHEAT,GBR,winter.day,57.17178106217242 +2030,RSHEAT,GBR,winter.peak,73.53824144649826 +2030,RSHEAT,GBR,winter.evening,56.387447293948604 +2030,RSHEAT,GBR,peak.night,45.6773279755648 +2030,RSHEAT,GBR,peak.day,52.210208333739914 +2030,RSHEAT,GBR,peak.peak,106.78988305727464 +2030,RSHEAT,GBR,peak.evening,51.07244300192399 2030,RSHEAT,GBR,summer.night,59.40752206555305 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,41.54976285464197 -2030,RSHEAT,GBR,autumn.day,59.63965318459326 -2030,RSHEAT,GBR,autumn.peak,54.12510715585182 -2030,RSHEAT,GBR,autumn.evening,123.80169309625555 +2030,RSHEAT,GBR,autumn.night,41.84887656119677 +2030,RSHEAT,GBR,autumn.day,85.24030121983449 +2030,RSHEAT,GBR,autumn.peak,54.67274224641541 +2030,RSHEAT,GBR,autumn.evening,48.13626193972428 diff --git a/tests/data/missing_commodity/commodity_flows.csv b/tests/data/missing_commodity/commodity_flows.csv index 462581ee8..22d67697f 100644 --- a/tests/data/missing_commodity/commodity_flows.csv +++ b/tests/data/missing_commodity/commodity_flows.csv @@ -543,22 +543,22 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,10,,BIOPRD,autumn.day,5.949902199746202 2030,10,,BIOPRD,autumn.peak,1.7849706542119543 2030,10,,BIOPRD,autumn.evening,2.3799608913222925 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.18157714686448934 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 2040,6,,BIOPEL,winter.night,-0.0 2040,6,,RSHEAT,winter.night,0.0 2040,6,,BIOPEL,winter.day,-35.642772956518364 @@ -587,26 +587,26 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,RSHEAT,autumn.night,0.0 2040,6,,BIOPEL,autumn.day,-0.0 2040,6,,RSHEAT,autumn.day,0.0 -2040,6,,BIOPEL,autumn.peak,-69.34814965325921 -2040,6,,RSHEAT,autumn.peak,57.79012471104935 +2040,6,,BIOPEL,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 2040,6,,BIOPEL,autumn.evening,-0.0 2040,6,,RSHEAT,autumn.evening,0.0 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.9384167272919108 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,BIOPRD,winter.night,-4.103992772696848 2040,9,,BIOPEL,winter.night,3.908564545425569 2040,9,,BIOPRD,winter.day,-5.862846810097878 @@ -683,8 +683,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,11,,RSHEAT,autumn.night,33.792199693023704 2040,11,,BIOPEL,autumn.day,-118.59895320132445 2040,11,,RSHEAT,autumn.day,98.83246100110371 -2040,11,,BIOPEL,autumn.peak,-0.15368824198878173 -2040,11,,RSHEAT,autumn.peak,0.12807353499065144 +2040,11,,BIOPEL,autumn.peak,-69.501837895248 +2040,11,,RSHEAT,autumn.peak,57.918198246040006 2040,11,,BIOPEL,autumn.evening,-38.492798194324436 2040,11,,RSHEAT,autumn.evening,32.0773318286037 2040,12,,ELCTRI,winter.night,-2.71398300195538 @@ -745,8 +745,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,13,,BIOPEL,summer.evening,0.0 2040,13,,BIOPRD,autumn.night,-0.0 2040,13,,BIOPEL,autumn.night,0.0 -2040,13,,BIOPRD,autumn.day,-93.16619861728446 -2040,13,,BIOPEL,autumn.day,88.72971296884235 +2040,13,,BIOPRD,autumn.day,-93.16619861728452 +2040,13,,BIOPEL,autumn.day,88.72971296884239 2040,13,,BIOPRD,autumn.peak,-80.28653181213319 2040,13,,BIOPEL,autumn.peak,76.46336363060304 2040,13,,BIOPRD,autumn.evening,-107.04870993923393 @@ -764,6 +764,6 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,14,,BIOPRD,summer.peak,0.0 2040,14,,BIOPRD,summer.evening,-0.0 2040,14,,BIOPRD,autumn.night,0.0 -2040,14,,BIOPRD,autumn.day,93.16619861728451 +2040,14,,BIOPRD,autumn.day,93.16619861728456 2040,14,,BIOPRD,autumn.peak,80.28653181213316 2040,14,,BIOPRD,autumn.evening,107.04870993923389 diff --git a/tests/data/missing_commodity/commodity_prices.csv b/tests/data/missing_commodity/commodity_prices.csv index ec07a533a..8515c816a 100644 --- a/tests/data/missing_commodity/commodity_prices.csv +++ b/tests/data/missing_commodity/commodity_prices.csv @@ -191,22 +191,22 @@ milestone_year,commodity_id,region_id,time_slice,price 2030,RSHEAT,GBR,autumn.day,47.637748671270714 2030,RSHEAT,GBR,autumn.peak,52.34104148465709 2030,RSHEAT,GBR,autumn.evening,178.68956812294957 -2040,BIOPRD,GBR,winter.night,0.8948725067523041 -2040,BIOPRD,GBR,winter.day,0.8948725067523041 -2040,BIOPRD,GBR,winter.peak,0.8948725067523041 -2040,BIOPRD,GBR,winter.evening,0.8948725067523041 +2040,BIOPRD,GBR,winter.night,0.894872506752304 +2040,BIOPRD,GBR,winter.day,0.894872506752304 +2040,BIOPRD,GBR,winter.peak,0.894872506752304 +2040,BIOPRD,GBR,winter.evening,0.894872506752304 2040,BIOPRD,GBR,peak.night,0.8707150975584493 2040,BIOPRD,GBR,peak.day,0.8707150975584493 2040,BIOPRD,GBR,peak.peak,0.8707150975584493 2040,BIOPRD,GBR,peak.evening,0.8707150975584493 -2040,BIOPRD,GBR,summer.night,0.8707150975584496 -2040,BIOPRD,GBR,summer.day,0.8707150975584496 -2040,BIOPRD,GBR,summer.peak,0.8707150975584496 -2040,BIOPRD,GBR,summer.evening,0.8707150975584496 -2040,BIOPRD,GBR,autumn.night,0.8707150975584493 -2040,BIOPRD,GBR,autumn.day,0.8707150975584493 -2040,BIOPRD,GBR,autumn.peak,0.8707150975584493 -2040,BIOPRD,GBR,autumn.evening,0.8707150975584493 +2040,BIOPRD,GBR,summer.night,0.8707150975584493 +2040,BIOPRD,GBR,summer.day,0.8707150975584493 +2040,BIOPRD,GBR,summer.peak,0.8707150975584493 +2040,BIOPRD,GBR,summer.evening,0.8707150975584493 +2040,BIOPRD,GBR,autumn.night,0.8707150975584491 +2040,BIOPRD,GBR,autumn.day,0.8707150975584491 +2040,BIOPRD,GBR,autumn.peak,0.8707150975584491 +2040,BIOPRD,GBR,autumn.evening,0.8707150975584491 2040,BIOPEL,GBR,winter.night,2.13913980186708 2040,BIOPEL,GBR,winter.day,2.13913980186708 2040,BIOPEL,GBR,winter.peak,2.13913980186708 @@ -219,39 +219,39 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,BIOPEL,GBR,summer.day,2.094165732835812 2040,BIOPEL,GBR,summer.peak,2.094165732835812 2040,BIOPEL,GBR,summer.evening,2.094165732835812 -2040,BIOPEL,GBR,autumn.night,2.094165732835812 -2040,BIOPEL,GBR,autumn.day,2.094165732835812 -2040,BIOPEL,GBR,autumn.peak,2.094165732835812 -2040,BIOPEL,GBR,autumn.evening,2.094165732835812 -2040,ELCTRI,GBR,winter.night,18.983528899074727 -2040,ELCTRI,GBR,winter.day,18.983528899074727 -2040,ELCTRI,GBR,winter.peak,18.983528899074727 -2040,ELCTRI,GBR,winter.evening,18.983528899074727 -2040,ELCTRI,GBR,peak.night,18.983528899074727 -2040,ELCTRI,GBR,peak.day,18.983528899074727 -2040,ELCTRI,GBR,peak.peak,18.983528899074727 -2040,ELCTRI,GBR,peak.evening,18.983528899074727 -2040,ELCTRI,GBR,summer.night,279.53626095723007 -2040,ELCTRI,GBR,summer.day,18.983528899074727 -2040,ELCTRI,GBR,summer.peak,18.983528899074727 -2040,ELCTRI,GBR,summer.evening,18.983528899074727 -2040,ELCTRI,GBR,autumn.night,18.983528899074727 -2040,ELCTRI,GBR,autumn.day,18.983528899074727 -2040,ELCTRI,GBR,autumn.peak,18.983528899074727 -2040,ELCTRI,GBR,autumn.evening,18.983528899074727 -2040,RSHEAT,GBR,winter.night,24.50534000928853 -2040,RSHEAT,GBR,winter.day,29.18950619010678 -2040,RSHEAT,GBR,winter.peak,44.099786210036015 -2040,RSHEAT,GBR,winter.evening,63.019009356269486 -2040,RSHEAT,GBR,peak.night,24.74827562662383 -2040,RSHEAT,GBR,peak.day,24.29886016799074 -2040,RSHEAT,GBR,peak.peak,29.301349408247503 -2040,RSHEAT,GBR,peak.evening,24.393064299427536 -2040,RSHEAT,GBR,summer.night,115.86875985514284 -2040,RSHEAT,GBR,summer.day,29.88635827595158 -2040,RSHEAT,GBR,summer.peak,29.88635827595158 -2040,RSHEAT,GBR,summer.evening,29.88635827595158 -2040,RSHEAT,GBR,autumn.night,24.972779135933592 -2040,RSHEAT,GBR,autumn.day,24.426037804946965 -2040,RSHEAT,GBR,autumn.peak,65.13656657294746 -2040,RSHEAT,GBR,autumn.evening,24.55762831789989 +2040,BIOPEL,GBR,autumn.night,2.0941657328358114 +2040,BIOPEL,GBR,autumn.day,2.0941657328358114 +2040,BIOPEL,GBR,autumn.peak,2.0941657328358114 +2040,BIOPEL,GBR,autumn.evening,2.0941657328358114 +2040,ELCTRI,GBR,winter.night,17.34749532546054 +2040,ELCTRI,GBR,winter.day,17.34749532546054 +2040,ELCTRI,GBR,winter.peak,17.34749532546054 +2040,ELCTRI,GBR,winter.evening,17.34749532546054 +2040,ELCTRI,GBR,peak.night,17.34749532546054 +2040,ELCTRI,GBR,peak.day,17.34749532546054 +2040,ELCTRI,GBR,peak.peak,17.34749532546054 +2040,ELCTRI,GBR,peak.evening,17.34749532546054 +2040,ELCTRI,GBR,summer.night,216.42616440708937 +2040,ELCTRI,GBR,summer.day,17.34749532546054 +2040,ELCTRI,GBR,summer.peak,17.34749532546054 +2040,ELCTRI,GBR,summer.evening,235.07444381186068 +2040,ELCTRI,GBR,autumn.night,17.34749532546054 +2040,ELCTRI,GBR,autumn.day,17.34749532546054 +2040,ELCTRI,GBR,autumn.peak,17.34749532546054 +2040,ELCTRI,GBR,autumn.evening,17.34749532546054 +2040,RSHEAT,GBR,winter.night,23.16618104207456 +2040,RSHEAT,GBR,winter.day,30.4645069786871 +2040,RSHEAT,GBR,winter.peak,53.2617449110213 +2040,RSHEAT,GBR,winter.evening,82.07634986300435 +2040,RSHEAT,GBR,peak.night,23.451942769145234 +2040,RSHEAT,GBR,peak.day,22.93636320769898 +2040,RSHEAT,GBR,peak.peak,30.66274843972311 +2040,RSHEAT,GBR,peak.evening,23.04443631430803 +2040,RSHEAT,GBR,summer.night,95.04242799359642 +2040,RSHEAT,GBR,summer.day,29.3464671966589 +2040,RSHEAT,GBR,summer.peak,29.346467196658896 +2040,RSHEAT,GBR,summer.evening,101.19636019717095 +2040,RSHEAT,GBR,autumn.night,23.709498264065523 +2040,RSHEAT,GBR,autumn.day,23.08226426434509 +2040,RSHEAT,GBR,autumn.peak,22.73966049291494 +2040,RSHEAT,GBR,autumn.evening,23.233227871972446 diff --git a/tests/data/simple/commodity_flows.csv b/tests/data/simple/commodity_flows.csv index 848337bca..e0427fc83 100644 --- a/tests/data/simple/commodity_flows.csv +++ b/tests/data/simple/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,46 +591,46 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 -2040,6,,GASNAT,winter.night,-29.838533129172095 -2040,6,,RSHEAT,winter.night,25.94655054710617 -2040,6,,CO2EMT,winter.night,1525.6441988945694 -2040,6,,GASNAT,winter.day,-42.62647584035811 -2040,6,,RSHEAT,winter.day,37.066500730746185 -2040,6,,CO2EMT,winter.day,2179.4917097175103 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 +2040,6,,GASNAT,winter.night,-0.0 +2040,6,,RSHEAT,winter.night,0.0 +2040,6,,CO2EMT,winter.night,0.0 +2040,6,,GASNAT,winter.day,-0.0 +2040,6,,RSHEAT,winter.day,0.0 +2040,6,,CO2EMT,winter.day,0.0 2040,6,,GASNAT,winter.peak,-12.786113347771423 2040,6,,RSHEAT,winter.peak,11.118359432844716 2040,6,,CO2EMT,winter.peak,653.753975471553 -2040,6,,GASNAT,winter.evening,-17.050590417986076 -2040,6,,RSHEAT,winter.evening,14.826600363466154 -2040,6,,CO2EMT,winter.evening,871.7966880716282 -2040,6,,GASNAT,peak.night,-29.838533129172095 -2040,6,,RSHEAT,peak.night,25.94655054710617 -2040,6,,CO2EMT,peak.night,1525.6441988945694 -2040,6,,GASNAT,peak.day,-42.62647584035811 -2040,6,,RSHEAT,peak.day,37.066500730746185 -2040,6,,CO2EMT,peak.day,2179.4917097175103 -2040,6,,GASNAT,peak.peak,-12.787942711186016 -2040,6,,RSHEAT,peak.peak,11.119950183640015 -2040,6,,CO2EMT,peak.peak,653.8475108229411 -2040,6,,GASNAT,peak.evening,-17.050590417986076 -2040,6,,RSHEAT,peak.evening,14.826600363466154 -2040,6,,CO2EMT,peak.evening,871.7966880716282 +2040,6,,GASNAT,winter.evening,-0.0 +2040,6,,RSHEAT,winter.evening,0.0 +2040,6,,CO2EMT,winter.evening,0.0 +2040,6,,GASNAT,peak.night,-0.0 +2040,6,,RSHEAT,peak.night,0.0 +2040,6,,CO2EMT,peak.night,0.0 +2040,6,,GASNAT,peak.day,-0.0 +2040,6,,RSHEAT,peak.day,0.0 +2040,6,,CO2EMT,peak.day,0.0 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,RSHEAT,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 +2040,6,,GASNAT,peak.evening,-0.0 +2040,6,,RSHEAT,peak.evening,0.0 +2040,6,,CO2EMT,peak.evening,0.0 2040,6,,GASNAT,summer.night,-0.0 2040,6,,RSHEAT,summer.night,0.0 2040,6,,CO2EMT,summer.night,0.0 @@ -643,34 +643,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,summer.evening,-0.0 2040,6,,RSHEAT,summer.evening,0.0 2040,6,,CO2EMT,summer.evening,0.0 -2040,6,,GASNAT,autumn.night,-29.838533129172095 -2040,6,,RSHEAT,autumn.night,25.94655054710617 -2040,6,,CO2EMT,autumn.night,1525.6441988945694 -2040,6,,GASNAT,autumn.day,-42.62647584035811 -2040,6,,RSHEAT,autumn.day,37.066500730746185 -2040,6,,CO2EMT,autumn.day,2179.4917097175103 -2040,6,,GASNAT,autumn.peak,-12.787942711186016 -2040,6,,RSHEAT,autumn.peak,11.119950183640015 -2040,6,,CO2EMT,autumn.peak,653.8475108229411 -2040,6,,GASNAT,autumn.evening,-17.050590417986076 -2040,6,,RSHEAT,autumn.evening,14.826600363466154 -2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,6,,GASNAT,autumn.night,-0.0 +2040,6,,RSHEAT,autumn.night,0.0 +2040,6,,CO2EMT,autumn.night,0.0 +2040,6,,GASNAT,autumn.day,-0.0 +2040,6,,RSHEAT,autumn.day,0.0 +2040,6,,CO2EMT,autumn.day,0.0 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 +2040,6,,GASNAT,autumn.evening,-0.0 +2040,6,,RSHEAT,autumn.evening,0.0 +2040,6,,CO2EMT,autumn.evening,0.0 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,ELCTRI,winter.night,-2.71398300195538 2040,9,,RSHEAT,winter.night,8.224190915016303 2040,9,,ELCTRI,winter.day,-3.8771185689047805 @@ -703,30 +703,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,9,,RSHEAT,autumn.peak,3.5246532331800005 2040,9,,ELCTRI,autumn.evening,-1.5508474350059795 2040,9,,RSHEAT,autumn.evening,4.6995376818363015 -2040,10,,GASNAT,winter.night,-45.62106563892816 -2040,10,,RSHEAT,winter.night,39.670491859937535 -2040,10,,CO2EMT,winter.night,2332.605086118397 -2040,10,,GASNAT,winter.day,-237.06042122445515 -2040,10,,RSHEAT,winter.day,206.13949671691753 -2040,10,,CO2EMT,winter.day,12120.899337206392 +2040,10,,GASNAT,winter.night,-75.45959876810025 +2040,10,,RSHEAT,winter.night,65.6170424070437 +2040,10,,CO2EMT,winter.night,3858.249285012966 +2040,10,,GASNAT,winter.day,-279.68689706481325 +2040,10,,RSHEAT,winter.day,243.20599744766372 +2040,10,,CO2EMT,winter.day,14300.391046923904 2040,10,,GASNAT,winter.peak,-127.32947236525759 2040,10,,RSHEAT,winter.peak,110.7212803176153 2040,10,,CO2EMT,winter.peak,6510.355922035621 -2040,10,,GASNAT,winter.evening,-76.97045100924117 -2040,10,,RSHEAT,winter.evening,66.93082696455755 -2040,10,,CO2EMT,winter.evening,3935.499160102502 -2040,10,,GASNAT,peak.night,-20.19030718359216 -2040,10,,RSHEAT,peak.night,17.556788855297533 -2040,10,,CO2EMT,peak.night,1032.3304062970674 -2040,10,,GASNAT,peak.day,-102.01801896162715 -2040,10,,RSHEAT,peak.day,88.71132083619753 -2040,10,,CO2EMT,peak.day,5216.181309507997 -2040,10,,GASNAT,peak.peak,-71.49541567696298 -2040,10,,RSHEAT,peak.peak,62.16992667561999 -2040,10,,CO2EMT,peak.peak,3655.5606035631176 -2040,10,,GASNAT,peak.evening,-31.134620747525183 -2040,10,,RSHEAT,peak.evening,27.07358325871755 -2040,10,,CO2EMT,peak.evening,1591.9131588209627 +2040,10,,GASNAT,winter.evening,-94.02104142722726 +2040,10,,RSHEAT,winter.evening,81.75742732802371 +2040,10,,CO2EMT,winter.evening,4807.295848174131 +2040,10,,GASNAT,peak.night,-50.02884031276425 +2040,10,,RSHEAT,peak.night,43.503339402403704 +2040,10,,CO2EMT,peak.night,2557.974605191637 +2040,10,,GASNAT,peak.day,-144.64449480198527 +2040,10,,RSHEAT,peak.day,125.77782156694371 +2040,10,,CO2EMT,peak.day,7395.673019225507 +2040,10,,GASNAT,peak.peak,-84.283358388149 +2040,10,,RSHEAT,peak.peak,73.28987685926 +2040,10,,CO2EMT,peak.peak,4309.4081143860585 +2040,10,,GASNAT,peak.evening,-48.185211165511255 +2040,10,,RSHEAT,peak.evening,41.900183622183704 +2040,10,,CO2EMT,peak.evening,2463.7098468925906 2040,10,,GASNAT,summer.night,-0.0 2040,10,,RSHEAT,summer.night,0.0 2040,10,,CO2EMT,summer.night,0.0 @@ -739,15 +739,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,10,,GASNAT,summer.evening,-0.0 2040,10,,RSHEAT,summer.evening,0.0 2040,10,,CO2EMT,summer.evening,0.0 -2040,10,,GASNAT,autumn.night,-9.02249651780516 -2040,10,,RSHEAT,autumn.night,7.845649145917532 -2040,10,,CO2EMT,autumn.night,461.32024695537797 -2040,10,,GASNAT,autumn.day,-71.03085431091114 -2040,10,,RSHEAT,autumn.day,61.76596027035752 -2040,10,,CO2EMT,autumn.day,3631.8075809168868 -2040,10,,GASNAT,autumn.peak,-53.81798527175999 -2040,10,,RSHEAT,autumn.peak,46.79824806239999 -2040,10,,CO2EMT,autumn.peak,2751.7135869450885 -2040,10,,GASNAT,autumn.evening,-19.838341184908174 -2040,10,,RSHEAT,autumn.evening,17.250731465137545 -2040,10,,CO2EMT,autumn.evening,1014.334384784355 +2040,10,,GASNAT,autumn.night,-38.86102964697726 +2040,10,,RSHEAT,autumn.night,33.792199693023704 +2040,10,,CO2EMT,autumn.night,1986.9644458499474 +2040,10,,GASNAT,autumn.day,-113.65733015126926 +2040,10,,RSHEAT,autumn.day,98.83246100110371 +2040,10,,CO2EMT,autumn.day,5811.299290634398 +2040,10,,GASNAT,autumn.peak,-66.605927982946 +2040,10,,RSHEAT,autumn.peak,57.918198246040006 +2040,10,,CO2EMT,autumn.peak,3405.5610977680294 +2040,10,,GASNAT,autumn.evening,-36.888931602894246 +2040,10,,RSHEAT,autumn.evening,32.0773318286037 +2040,10,,CO2EMT,autumn.evening,1886.1310728559831 diff --git a/tests/data/simple/commodity_prices.csv b/tests/data/simple/commodity_prices.csv index 0421fb8e2..61efb0da6 100644 --- a/tests/data/simple/commodity_prices.csv +++ b/tests/data/simple/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -159,35 +159,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,10.866957996006988 2040,GASNAT,GBR,autumn.peak,10.866957996006988 2040,GASNAT,GBR,autumn.evening,10.866957996006988 -2040,ELCTRI,GBR,winter.night,18.40751185337733 -2040,ELCTRI,GBR,winter.day,18.40751185337733 -2040,ELCTRI,GBR,winter.peak,18.40751185337733 -2040,ELCTRI,GBR,winter.evening,18.40751185337733 -2040,ELCTRI,GBR,peak.night,18.40751185337733 -2040,ELCTRI,GBR,peak.day,18.40751185337733 -2040,ELCTRI,GBR,peak.peak,18.40751185337733 -2040,ELCTRI,GBR,peak.evening,18.40751185337733 -2040,ELCTRI,GBR,summer.night,278.4706392854486 -2040,ELCTRI,GBR,summer.day,18.40751185337733 -2040,ELCTRI,GBR,summer.peak,18.40751185337733 -2040,ELCTRI,GBR,summer.evening,18.40751185337733 -2040,ELCTRI,GBR,autumn.night,18.40751185337733 -2040,ELCTRI,GBR,autumn.day,18.40751185337733 -2040,ELCTRI,GBR,autumn.peak,18.40751185337733 -2040,ELCTRI,GBR,autumn.evening,18.40751185337733 -2040,RSHEAT,GBR,winter.night,43.53782587892427 -2040,RSHEAT,GBR,winter.day,51.57242660228903 -2040,RSHEAT,GBR,winter.peak,53.783649010260156 -2040,RSHEAT,GBR,winter.evening,50.55418775096135 -2040,RSHEAT,GBR,peak.night,37.67886076810967 -2040,RSHEAT,GBR,peak.day,46.73065586147608 -2040,RSHEAT,GBR,peak.peak,51.59664538797137 -2040,RSHEAT,GBR,peak.evening,44.83326564417469 -2040,RSHEAT,GBR,summer.night,115.51710470345496 -2040,RSHEAT,GBR,summer.day,29.696272650871435 -2040,RSHEAT,GBR,summer.peak,29.696272650871432 -2040,RSHEAT,GBR,summer.evening,29.696272650871435 -2040,RSHEAT,GBR,autumn.night,33.15707647035864 -2040,RSHEAT,GBR,autumn.day,44.169137586854056 -2040,RSHEAT,GBR,autumn.peak,50.18407566644177 -2040,RSHEAT,GBR,autumn.evening,41.51873841477455 +2040,ELCTRI,GBR,winter.night,17.314767437204573 +2040,ELCTRI,GBR,winter.day,17.314767437204573 +2040,ELCTRI,GBR,winter.peak,17.314767437204573 +2040,ELCTRI,GBR,winter.evening,17.314767437204573 +2040,ELCTRI,GBR,peak.night,17.314767437204573 +2040,ELCTRI,GBR,peak.day,17.314767437204573 +2040,ELCTRI,GBR,peak.peak,17.314767437204573 +2040,ELCTRI,GBR,peak.evening,17.314767437204573 +2040,ELCTRI,GBR,summer.night,207.7596152550184 +2040,ELCTRI,GBR,summer.day,17.314767437204573 +2040,ELCTRI,GBR,summer.peak,17.314767437204573 +2040,ELCTRI,GBR,summer.evening,232.6474400224208 +2040,ELCTRI,GBR,autumn.night,17.314767437204573 +2040,ELCTRI,GBR,autumn.day,17.314767437204573 +2040,ELCTRI,GBR,autumn.peak,17.314767437204573 +2040,ELCTRI,GBR,autumn.evening,17.314767437204573 +2040,RSHEAT,GBR,winter.night,44.6159319641907 +2040,RSHEAT,GBR,winter.day,45.73870127589408 +2040,RSHEAT,GBR,winter.peak,68.7169731750329 +2040,RSHEAT,GBR,winter.evening,45.59641077837997 +2040,RSHEAT,GBR,peak.night,43.79718981990048 +2040,RSHEAT,GBR,peak.day,45.06210367145064 +2040,RSHEAT,GBR,peak.peak,45.74208565182849 +2040,RSHEAT,GBR,peak.evening,44.79695900755749 +2040,RSHEAT,GBR,summer.night,92.182466773413 +2040,RSHEAT,GBR,summer.day,29.335666993534428 +2040,RSHEAT,GBR,summer.peak,29.335666993534428 +2040,RSHEAT,GBR,summer.evening,100.39544894665578 +2040,RSHEAT,GBR,autumn.night,43.165307686804155 +2040,RSHEAT,GBR,autumn.day,44.70415257852956 +2040,RSHEAT,GBR,autumn.peak,45.544690661264404 +2040,RSHEAT,GBR,autumn.evening,44.333781111840324 diff --git a/tests/data/simple/debug_appraisal_results.csv b/tests/data/simple/debug_appraisal_results.csv index 0ee4fff55..fc2bf40db 100644 --- a/tests/data/simple/debug_appraisal_results.csv +++ b/tests/data/simple/debug_appraisal_results.csv @@ -220,16 +220,16 @@ milestone_year,run_description,asset_id,process_id,region_id,capacity,metric 2040,ironing out iteration 0; RSHEAT A0_RES round 65,,RELCHP,GBR,48.20298763807933,721.4552074663916 2040,ironing out iteration 0; RSHEAT A0_RES round 66,,RGASBR,GBR,0.05090402545000927, 2040,ironing out iteration 0; RSHEAT A0_RES round 66,,RELCHP,GBR,0.05090402545000927,721.8821998840756 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,3.964844,3.7874578930486513 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,4.541646703508873,4.254125601934196 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,0.3154270422407466,25.704150021671687 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,0.1410771962885117,11.510341759558722 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,0.0627009761240922,29.813520779465232 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,3.964844,5.0790826274426495 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,4.541646703508873,5.710050649005492 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,0.3154270422407466,26.67261718970271 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,0.10266249906775954,14.726493327952323 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,0.045627777360439464,34.20646358556587 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,7,WNDFRM,GBR,4.541646703508873,282.40096578542466 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,8,GASCGT,GBR,0.3154270422407466, -2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,0.1410771962885117,339.92248757186036 -2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,GASCGT,GBR,0.0627009761240922, -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,3782.13,10.234498424510788 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,65.13545790755073,10.865301662961635 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,4002.26,3.1798403292743007 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,68.39223080292828,4.0734276217246475 +2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,0.10266249906775954,339.9224875718603 +2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,GASCGT,GBR,0.045627777360439464, +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,3782.13,10.215528150028938 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,67.01200939953996,10.865301662961636 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,4002.26,3.179840329274301 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,68.39223080292827,4.0734276217246475 diff --git a/tests/data/simple/debug_appraisal_results_time_slices.csv b/tests/data/simple/debug_appraisal_results_time_slices.csv index 987ecb59c..75b38cf1f 100644 --- a/tests/data/simple/debug_appraisal_results_time_slices.csv +++ b/tests/data/simple/debug_appraisal_results_time_slices.csv @@ -1311,11 +1311,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; ELCTRI A0_ELC round 19,,GASCGT,GBR,autumn.day,0.043720883598124316,2.220446049250313e-14,0.043720883598124316,0.0 2030,ironing out iteration 0; ELCTRI A0_ELC round 19,,GASCGT,GBR,autumn.peak,-0.0,9.268924030303054,0.0,0.0 2030,ironing out iteration 0; ELCTRI A0_ELC round 19,,GASCGT,GBR,autumn.evening,-0.0,9.268924030303054,0.0,0.0 -2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.night,0.0,2.2426505097428162e-14,44.00811912590308,1.4210854715202004e-14 +2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.night,0.0,2.2426505097428162e-14,44.00811912590307,1.4210854715202004e-14 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.day,175.95189938963907,2.2426505097428162e-14,219.27676569358,1.4210854715202004e-14 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.peak,118.1915625,2.2426505097428162e-14,117.006692711186,1.4210854715202004e-14 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.evening,157.58875126070998,2.2426505097428162e-14,71.44063561968,1.4210854715202004e-14 -2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.night,267.681753031716,2.2426505097428162e-14,55.29824430978717,0.0 +2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.night,267.681753031716,2.2426505097428162e-14,55.298244309787165,0.0 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.day,0.0,2.2426505097428162e-14,96.33232234124566,0.0 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.peak,0.0,2.2426505097428162e-14,66.59319215406882,0.0 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.evening,0.0,2.2426505097428162e-14,49.45799422661436,0.0 @@ -1327,11 +1327,11 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.day,0.0,2.2426505097428162e-14,69.28324147048181,0.0 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.peak,0.0,2.2426505097428162e-14,64.85805293386579,0.0 2030,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.evening,0.0,2.2426505097428162e-14,39.163708628997355,0.0 -2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.night,3.799120378514022,2.2426505097428162e-14,44.00811912590308,109.6766643935789 +2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.night,3.799120378514022,2.2426505097428162e-14,44.00811912590307,109.6766643935789 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.day,5.427314819005428,2.2426505097428162e-14,219.27676569358,109.6766643935789 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.peak,1.6281944404914062,2.2426505097428162e-14,117.006692711186,109.6766643935789 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.evening,2.1709259380226156,2.2426505097428162e-14,71.44063561968,109.6766643935789 -2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.night,3.799120378514022,2.2426505097428162e-14,55.29824430978717,63.66404936392064 +2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.night,3.799120378514022,2.2426505097428162e-14,55.298244309787165,63.66404936392064 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.day,5.427314819005428,2.2426505097428162e-14,96.33232234124566,63.66404936392064 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,1.6281944404914062,2.2426505097428162e-14,66.59319215406882,63.66404936392064 2030,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,2.1709259380226156,2.2426505097428162e-14,49.45799422661436,63.66404936392064 @@ -3539,82 +3539,82 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,winter.day,3.8771185689047805,2.220446049250313e-14,3.8771185689047805,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,winter.peak,1.1631355669494001,2.220446049250313e-14,1.1631355669494001,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,winter.evening,1.5508474350059795,2.220446049250313e-14,1.5508474350059795,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.night,2.71398300195538,16.862233030303056,2.71398300195538,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.night,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.day,3.8771185689047805,7.593309000000022,3.8771185689047805,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.peak,1.1631355669494001,7.593309000000022,1.1631355669494001,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.evening,1.5508474350059795,16.862233030303056,1.5508474350059795,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,peak.evening,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,summer.night,1.6368416242136155,2.220446049250313e-14,2.1199938741564,0.4831522499427847 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,summer.day,3.5321677056534004,2.220446049250313e-14,3.5321677056534004,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,summer.peak,1.1631355669494001,2.220446049250313e-14,1.1631355669494001,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,summer.evening,0.8660474423502,2.220446049250313e-14,0.8660474423502,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.night,2.71398300195538,16.862233030303056,2.71398300195538,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.night,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.day,3.8771185689047805,7.593309000000022,3.8771185689047805,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.peak,1.1631355669494001,16.862233030303056,1.1631355669494001,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.evening,1.5508474350059795,16.862233030303056,1.5508474350059795,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.peak,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,2,WNDFRM,GBR,autumn.evening,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,winter.night,2.71398300195538,7.593309000000022,2.71398300195538,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,winter.day,3.8771185689047805,2.220446049250313e-14,3.8771185689047805,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,winter.peak,1.1631355669494001,2.220446049250313e-14,1.1631355669494001,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,winter.evening,1.5508474350059795,2.220446049250313e-14,1.5508474350059795,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.night,2.71398300195538,16.862233030303056,2.71398300195538,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.night,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.day,3.8771185689047805,7.593309000000022,3.8771185689047805,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.peak,1.1631355669494001,7.593309000000022,1.1631355669494001,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.evening,1.5508474350059795,16.862233030303056,1.5508474350059795,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,peak.evening,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,summer.night,1.8749681870903057,2.220446049250313e-14,2.1199938741564,0.2450256870660945 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,summer.day,3.5321677056534004,2.220446049250313e-14,3.5321677056534004,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,summer.peak,1.1631355669494001,2.220446049250313e-14,1.1631355669494001,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,summer.evening,0.8660474423502,2.220446049250313e-14,0.8660474423502,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.night,2.71398300195538,16.862233030303056,2.71398300195538,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.night,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.day,3.8771185689047805,7.593309000000022,3.8771185689047805,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.peak,1.1631355669494001,16.862233030303056,1.1631355669494001,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.evening,1.5508474350059795,16.862233030303056,1.5508474350059795,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.peak,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,7,WNDFRM,GBR,autumn.evening,-0.0,16.862233030303056,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,winter.night,0.7254164865027732,2.220446049250313e-14,2.71398300195538,1.9885665154526069 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,winter.day,0.0,-7.593308999999977,3.8771185689047805,3.8771185689047805 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,winter.peak,0.0,-7.593308999999977,1.1631355669494001,1.1631355669494001 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,winter.evening,0.0,-7.593308999999977,1.5508474350059795,1.5508474350059795 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.night,0.7254164865027732,9.268924030303054,2.71398300195538,1.9885665154526069 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.night,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.day,1.0363092650113093,2.220446049250313e-14,3.8771185689047805,2.8408093038934714 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.peak,0.31089277850853586,2.220446049250313e-14,1.1631355669494001,0.8522427884408643 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.evening,0.4145237079942374,9.268924030303054,1.5508474350059795,1.1363237270117421 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,peak.evening,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,summer.night,0.0,-7.593308999999977,2.1199938741564,2.1199938741564 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,summer.day,0.0,-7.593308999999977,3.5321677056534004,3.5321677056534004 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,summer.peak,0.0,-7.593308999999977,1.1631355669494001,1.1631355669494001 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,summer.evening,0.0,-7.593308999999977,0.8660474423502,0.8660474423502 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.night,0.7254164865027732,9.268924030303054,2.71398300195538,1.9885665154526069 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.night,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.day,1.0363092650113093,2.220446049250313e-14,3.8771185689047805,2.8408093038934714 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.peak,0.31089277850853586,9.268924030303054,1.1631355669494001,0.8522427884408643 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.evening,0.4145237079942374,9.268924030303054,1.5508474350059795,1.1363237270117421 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.night,0.15781743086438696,7.593309000000022,2.71398300195538,2.556165571090993 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.day,0.25175637773258197,2.220446049250313e-14,3.8771185689047805,3.6253621911721985 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.peak,0.07014108019742628,2.220446049250313e-14,1.1631355669494001,1.0929944867519739 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.evening,0.09143390871520089,2.220446049250313e-14,1.5508474350059795,1.4594135262907786 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.night,0.10145406290710829,16.862233030303056,2.71398300195538,2.6125289390482718 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.day,0.22670599196694652,7.593309000000022,3.8771185689047805,3.6504125769378337 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.peak,0.06325222406439625,7.593309000000022,1.1631355669494001,1.099883342885004 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.evening,0.06137344565214812,16.862233030303056,1.5508474350059795,1.4894739893538314 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.night,0.058242147008152285,2.220446049250313e-14,2.1199938741564,2.061751727148248 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.day,0.16220124836551164,2.220446049250313e-14,3.5321677056534004,3.3699664572878887 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.peak,0.04759573294145026,2.220446049250313e-14,1.1631355669494001,1.1155398340079499 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.evening,0.03757557892151545,2.220446049250313e-14,0.8660474423502,0.8284718634286846 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.night,0.11397925571440397,16.862233030303056,2.71398300195538,2.600003746240976 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.day,0.2135545395095125,7.593309000000022,3.8771185689047805,3.663564029395268 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.peak,0.05511084864709252,16.862233030303056,1.1631355669494001,1.1080247183023075 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.evening,0.06763604216996719,16.862233030303056,1.5508474350059795,1.4832113928360124 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,winter.night,0.14419918304124912,2.220446049250313e-14,2.71398300195538,2.569783818914131 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.peak,-0.0,9.268924030303054,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,8,GASCGT,GBR,autumn.evening,-0.0,9.268924030303054,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.night,0.1148444417328607,7.593309000000022,2.71398300195538,2.5991385602225194 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.day,0.18320422842411152,2.220446049250313e-14,3.8771185689047805,3.693914340480669 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.peak,0.051041973967597964,2.220446049250313e-14,1.1631355669494001,1.112093592981802 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,winter.evening,0.06653685935917851,2.220446049250313e-14,1.5508474350059795,1.4843105756468011 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.night,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.day,0.1649749520210548,7.593309000000022,3.8771185689047805,3.7121436168837256 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.peak,0.04602892292220576,7.593309000000022,1.1631355669494001,1.1171066440271944 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,peak.evening,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.night,0.0423830677120967,2.220446049250313e-14,2.1199938741564,2.0776108064443033 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.day,0.11803456509767475,2.220446049250313e-14,3.5321677056534004,3.414133140555726 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.peak,0.034635625156160504,2.220446049250313e-14,1.1631355669494001,1.1284999417932395 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,summer.evening,0.027343914803293692,2.220446049250313e-14,0.8660474423502,0.8387035275469064 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.night,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.day,0.1554045819600434,7.593309000000022,3.8771185689047805,3.721713986944737 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.peak,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,WNDFRM,GBR,autumn.evening,-0.0,16.862233030303056,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,winter.night,0.1049343826217607,2.220446049250313e-14,2.71398300195538,2.6090486193336195 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,winter.day,0.0,-7.593308999999977,3.8771185689047805,3.8771185689047805 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,winter.peak,0.0,-7.593308999999977,1.1631355669494001,1.1631355669494001 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,winter.evening,0.0,-7.593308999999977,1.5508474350059795,1.5508474350059795 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.night,0.14419918304124912,9.268924030303054,2.71398300195538,2.569783818914131 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.day,0.20599883263355753,2.220446049250313e-14,3.8771185689047805,3.671119736271223 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.peak,0.061799649592308374,2.220446049250313e-14,1.1631355669494001,1.1013359173570918 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.evening,0.08239953344894074,9.268924030303054,1.5508474350059795,1.4684479015570389 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.night,-0.0,9.268924030303054,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.day,0.14990626068264387,2.220446049250313e-14,3.8771185689047805,3.7272123082221364 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.peak,0.044971878060883146,2.220446049250313e-14,1.1631355669494001,1.118163688888517 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,peak.evening,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,summer.night,0.0,-7.593308999999977,2.1199938741564,2.1199938741564 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,summer.day,0.0,-7.593308999999977,3.5321677056534004,3.5321677056534004 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,summer.peak,0.0,-7.593308999999977,1.1631355669494001,1.1631355669494001 2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,summer.evening,0.0,-7.593308999999977,0.8660474423502,0.8660474423502 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.night,0.14419918304124912,9.268924030303054,2.71398300195538,2.569783818914131 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.day,0.20599883263355753,2.220446049250313e-14,3.8771185689047805,3.671119736271223 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.peak,0.061799649592308374,9.268924030303054,1.1631355669494001,1.1013359173570918 -2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.evening,0.08239953344894074,9.268924030303054,1.5508474350059795,1.4684479015570389 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.night,-0.0,9.268924030303054,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.day,0.14990626068264387,2.220446049250313e-14,3.8771185689047805,3.7272123082221364 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.peak,-0.0,9.268924030303054,0.0,0.0 +2040,ironing out iteration 0; ELCTRI A0_ELC round 0,,GASCGT,GBR,autumn.evening,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,7,WNDFRM,GBR,winter.night,-0.0,7.593309000000022,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,7,WNDFRM,GBR,winter.day,-0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,7,WNDFRM,GBR,winter.peak,-0.0,2.220446049250313e-14,0.0,0.0 @@ -3655,7 +3655,7 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,peak.day,-0.0,7.593309000000022,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,peak.peak,-0.0,7.593309000000022,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,peak.evening,-0.0,16.862233030303056,0.0,0.0 -2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,summer.night,0.058242147008152285,2.220446049250313e-14,0.4831522499427847,0.42491010293463244 +2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,summer.night,0.0423830677120967,2.220446049250313e-14,0.4831522499427847,0.440769182230688 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,summer.day,-0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,summer.peak,-0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,WNDFRM,GBR,summer.evening,-0.0,2.220446049250313e-14,0.0,0.0 @@ -3681,40 +3681,40 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; ELCTRI A0_ELC round 1,,GASCGT,GBR,autumn.evening,-0.0,9.268924030303054,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.night,0.0,2.2426505097428162e-14,75.45959876810025,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.day,313.50280921245974,2.2426505097428162e-14,279.68689706481325,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.peak,118.1915625,2.2426505097428162e-14,140.11558571302902,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.peak,118.1915625,2.2426505097428162e-14,140.115585713029,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,winter.evening,157.58875126070998,2.2426505097428162e-14,94.02104142722725,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.night,0.0,2.2426505097428162e-14,50.02884031276426,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.day,327.1419046684098,2.2426505097428162e-14,144.64449480198527,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.night,0.0,2.2426505097428162e-14,59.486659865033,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.day,342.0041925547903,2.2426505097428162e-14,144.64449480198527,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.peak,0.0,2.2426505097428162e-14,84.283358388149,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.evening,0.0,2.2426505097428162e-14,48.18521116551126,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,peak.evening,0.0,2.2426505097428162e-14,53.589679499623,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,summer.night,-0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,summer.day,0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,summer.peak,0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,summer.evening,0.0,2.2426505097428162e-14,0.0,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.night,256.0132193840867,2.2426505097428162e-14,38.86102964697726,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.night,274.92885848862426,2.2426505097428162e-14,48.318849199246,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.day,0.0,2.2426505097428162e-14,113.65733015126925,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.peak,0.0,2.2426505097428162e-14,66.605927982946,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.evening,0.0,2.2426505097428162e-14,36.888931602894246,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.night,4.749460494137393,2.2426505097428162e-14,75.45959876810025,143.24981460778665 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.day,6.784943553748354,2.2426505097428162e-14,279.68689706481325,143.24981460778665 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.peak,2.0354830596109603,2.2426505097428162e-14,140.11558571302902,143.24981460778665 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.evening,2.713977434526433,2.2426505097428162e-14,94.02104142722725,143.24981460778665 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.night,4.749460494137393,2.2426505097428162e-14,50.02884031276426,77.71451003159666 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.day,6.784943553748354,2.2426505097428162e-14,144.64449480198527,77.71451003159666 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,2.0354830596109603,2.2426505097428162e-14,84.283358388149,77.71451003159666 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,2.713977434526433,2.2426505097428162e-14,48.18521116551126,77.71451003159666 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.peak,0.0,2.2426505097428162e-14,70.659279201103,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,1,GASPRC,GBR,autumn.evening,0.0,2.2426505097428162e-14,42.293399937006,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.night,4.886292374387126,2.2426505097428162e-14,75.45959876810025,143.1325301390682 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.day,6.980417668122749,2.2426505097428162e-14,279.68689706481325,143.1325301390682 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.peak,2.094125293735624,2.2426505097428162e-14,140.115585713029,143.1325301390682 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,winter.evening,2.7921670806515015,2.2426505097428162e-14,94.02104142722725,143.1325301390682 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.night,4.886292374387126,2.2426505097428162e-14,59.486659865033,81.31279753447332 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.day,6.980417668122749,2.2426505097428162e-14,144.64449480198527,81.31279753447332 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.peak,2.094125293735624,2.2426505097428162e-14,84.283358388149,81.31279753447332 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,peak.evening,2.7921670806515015,2.2426505097428162e-14,53.589679499623,81.31279753447332 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.night,-0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.day,0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.peak,0.0,2.2426505097428162e-14,0.0,0.0 2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,summer.evening,0.0,2.2426505097428162e-14,0.0,0.0 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,4.749460494137393,2.2426505097428162e-14,38.86102964697726,59.93233871051589 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,6.784943553748354,2.2426505097428162e-14,113.65733015126925,59.93233871051589 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,2.0354830596109603,2.2426505097428162e-14,66.605927982946,59.93233871051589 -2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,2.713977434526433,2.2426505097428162e-14,36.888931602894246,59.93233871051589 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.220446049250313e-14,0.0,0.0 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,326.91581945440834,2.220446049250313e-14,329.1779496730829,0.0 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.peak,125.070625,2.220446049250313e-14,124.10114062500001,0.0 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.evening,166.76083466742,2.220446049250313e-14,165.4681888237455,0.0 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.night,4.886292374387126,2.2426505097428162e-14,48.318849199246,64.54396401793181 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.day,6.980417668122749,2.2426505097428162e-14,113.65733015126925,64.54396401793181 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.peak,2.094125293735624,2.2426505097428162e-14,70.659279201103,64.54396401793181 +2040,ironing out iteration 0; GASNAT A0_GPR round 0,,GASPRC,GBR,autumn.evening,2.7921670806515015,2.2426505097428162e-14,42.293399937006,64.54396401793181 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.night,0.0,2.220446049250313e-14,289.5693294487456,0.0 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.day,326.9158194544081,2.220446049250313e-14,329.1779496730826,0.0 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.peak,125.070625,2.220446049250313e-14,0.0,0.0 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,winter.evening,166.76083466742,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,peak.night,0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,peak.day,343.4989999018303,2.220446049250313e-14,53.92967045308478,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,peak.peak,0.0,2.220446049250313e-14,124.10114062500001,0.0 @@ -3727,19 +3727,19 @@ milestone_year,run_description,asset_id,process_id,region_id,time_slice,activity 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.day,0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.peak,0.0,2.220446049250313e-14,103.34569152954563,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,0,GASDRV,GBR,autumn.evening,0.0,2.220446049250313e-14,165.4681888237455,0.0 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,4.986933518844264,2.220446049250313e-14,0.0,150.412305338176 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,7.124190731435773,2.220446049250313e-14,329.1779496730829,150.412305338176 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.peak,2.137257212591509,2.220446049250313e-14,124.10114062500001,150.412305338176 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.evening,2.8496763062527553,2.220446049250313e-14,165.4681888237455,150.412305338176 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.night,4.986933518844264,2.220446049250313e-14,0.0,81.6002355331765 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.day,7.124190731435773,2.220446049250313e-14,53.92967045308478,81.6002355331765 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.peak,2.137257212591509,2.220446049250313e-14,124.10114062500001,81.6002355331765 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.evening,2.8496763062527553,2.220446049250313e-14,165.4681888237455,81.6002355331765 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.night,4.986933518844263,2.220446049250313e-14,289.5693294487456,150.41230533817594 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.day,7.124190731435772,2.220446049250313e-14,329.1779496730826,150.41230533817594 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.peak,2.1372572125915084,2.220446049250313e-14,0.0,150.41230533817594 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,winter.evening,2.8496763062527544,2.220446049250313e-14,0.0,150.41230533817594 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.night,4.986933518844263,2.220446049250313e-14,0.0,81.6002355331765 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.day,7.124190731435772,2.220446049250313e-14,53.92967045308478,81.6002355331765 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.peak,2.1372572125915084,2.220446049250313e-14,124.10114062500001,81.6002355331765 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,peak.evening,2.8496763062527544,2.220446049250313e-14,165.4681888237455,81.6002355331765 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.night,-0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.day,0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.peak,0.0,2.220446049250313e-14,0.0,0.0 2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,summer.evening,0.0,2.220446049250313e-14,0.0,0.0 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,4.986933518844264,2.220446049250313e-14,0.0,62.9289556460417 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,7.124190731435773,2.220446049250313e-14,0.0,62.9289556460417 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,2.137257212591509,2.220446049250313e-14,103.34569152954563,62.9289556460417 -2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,2.8496763062527553,2.220446049250313e-14,165.4681888237455,62.9289556460417 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.night,4.986933518844263,2.220446049250313e-14,0.0,62.9289556460417 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.day,7.124190731435772,2.220446049250313e-14,0.0,62.9289556460417 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.peak,2.1372572125915084,2.220446049250313e-14,103.34569152954563,62.9289556460417 +2040,ironing out iteration 0; GASPRD A0_GEX round 0,,GASDRV,GBR,autumn.evening,2.8496763062527544,2.220446049250313e-14,165.4681888237455,62.9289556460417 diff --git a/tests/data/simple/debug_commodity_balance_duals.csv b/tests/data/simple/debug_commodity_balance_duals.csv index 1073a72ab..6dce6dd5b 100644 --- a/tests/data/simple/debug_commodity_balance_duals.csv +++ b/tests/data/simple/debug_commodity_balance_duals.csv @@ -631,10 +631,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,peak.day,2.9170059999999998 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,peak.peak,2.9170059999999998 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,peak.evening,2.9170059999999998 -2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.night,-0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.day,-0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.peak,-0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.evening,-0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.night,2.9170059999999998 +2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.day,2.9170059999999998 +2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.peak,2.9170059999999998 +2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,summer.evening,2.9170059999999998 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,autumn.night,2.9170059999999998 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,autumn.day,2.9170059999999998 2040,ironing out iteration 0; post GASNAT|GBR investment,GASNAT,GBR,autumn.peak,2.9170059999999998 @@ -679,10 +679,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,peak.day,2.917006 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,peak.peak,2.917006 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,peak.evening,2.917006 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.night,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.day,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.peak,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.evening,-0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.night,2.917006 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.day,2.917006 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.peak,2.917006 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,summer.evening,2.917006 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,autumn.night,2.917006 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,autumn.day,2.917006 2040,ironing out iteration 0; post GASPRD|GBR investment,GASNAT,GBR,autumn.peak,2.917006 @@ -695,10 +695,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,peak.day,2.20452 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,peak.peak,2.20452 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,peak.evening,2.20452 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.night,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.day,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.peak,-0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.evening,-0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.night,2.20452 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.day,2.20452 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.peak,2.20452 +2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,summer.evening,2.20452 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,autumn.night,2.20452 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,autumn.day,2.20452 2040,ironing out iteration 0; post GASPRD|GBR investment,GASPRD,GBR,autumn.peak,2.20452 @@ -711,10 +711,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,peak.day,2.20452 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,peak.peak,2.20452 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,peak.evening,2.20452 -2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.night,-0.0 -2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.day,-0.0 -2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.peak,-0.0 -2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.evening,-0.0 +2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.night,2.20452 +2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.day,2.20452 +2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.peak,2.20452 +2040,ironing out iteration 0; final without candidates,GASPRD,GBR,summer.evening,2.20452 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,autumn.night,2.20452 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,autumn.day,2.20452 2040,ironing out iteration 0; final without candidates,GASPRD,GBR,autumn.peak,2.20452 @@ -727,10 +727,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,peak.day,2.917006 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,peak.peak,2.917006 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,peak.evening,2.917006 -2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.night,-0.0 -2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.day,-0.0 -2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.peak,-0.0 -2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.evening,-0.0 +2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.night,2.917006 +2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.day,2.917006 +2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.peak,2.917006 +2040,ironing out iteration 0; final without candidates,GASNAT,GBR,summer.evening,2.917006 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,autumn.night,2.917006 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,autumn.day,2.917006 2040,ironing out iteration 0; final without candidates,GASNAT,GBR,autumn.peak,2.917006 @@ -839,10 +839,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,final without candidates,GASPRD,GBR,peak.day,2.20452 2040,final without candidates,GASPRD,GBR,peak.peak,2.20452 2040,final without candidates,GASPRD,GBR,peak.evening,2.20452 -2040,final without candidates,GASPRD,GBR,summer.night,-0.0 -2040,final without candidates,GASPRD,GBR,summer.day,-0.0 -2040,final without candidates,GASPRD,GBR,summer.peak,-0.0 -2040,final without candidates,GASPRD,GBR,summer.evening,-0.0 +2040,final without candidates,GASPRD,GBR,summer.night,2.20452 +2040,final without candidates,GASPRD,GBR,summer.day,2.20452 +2040,final without candidates,GASPRD,GBR,summer.peak,2.20452 +2040,final without candidates,GASPRD,GBR,summer.evening,2.20452 2040,final without candidates,GASPRD,GBR,autumn.night,2.20452 2040,final without candidates,GASPRD,GBR,autumn.day,2.20452 2040,final without candidates,GASPRD,GBR,autumn.peak,2.20452 @@ -855,10 +855,10 @@ milestone_year,run_description,commodity_id,region_id,time_slice,value 2040,final without candidates,GASNAT,GBR,peak.day,2.917006 2040,final without candidates,GASNAT,GBR,peak.peak,2.917006 2040,final without candidates,GASNAT,GBR,peak.evening,2.917006 -2040,final without candidates,GASNAT,GBR,summer.night,-0.0 -2040,final without candidates,GASNAT,GBR,summer.day,-0.0 -2040,final without candidates,GASNAT,GBR,summer.peak,-0.0 -2040,final without candidates,GASNAT,GBR,summer.evening,-0.0 +2040,final without candidates,GASNAT,GBR,summer.night,2.917006 +2040,final without candidates,GASNAT,GBR,summer.day,2.917006 +2040,final without candidates,GASNAT,GBR,summer.peak,2.917006 +2040,final without candidates,GASNAT,GBR,summer.evening,2.917006 2040,final without candidates,GASNAT,GBR,autumn.night,2.917006 2040,final without candidates,GASNAT,GBR,autumn.day,2.917006 2040,final without candidates,GASNAT,GBR,autumn.peak,2.917006 diff --git a/tests/data/simple/debug_dispatch_assets.csv b/tests/data/simple/debug_dispatch_assets.csv index f7350a04e..e565a5171 100644 --- a/tests/data/simple/debug_dispatch_assets.csv +++ b/tests/data/simple/debug_dispatch_assets.csv @@ -303,38 +303,38 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; post RSHEAT|GBR investment,5,,RELCHP,GBR,autumn.day,41.664583466660005,-3.0587449299999996,0.0 2030,ironing out iteration 0; post RSHEAT|GBR investment,5,,RELCHP,GBR,autumn.peak,0.0,-0.0,8.881784197001252e-16 2030,ironing out iteration 0; post RSHEAT|GBR investment,5,,RELCHP,GBR,autumn.evening,0.0,-0.0,8.881784197001252e-16 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.night,12.179665608293831,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.day,153.60894769845382,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.night,38.1262161554,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.day,190.6754484292,-0.0,0.0 2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.peak,90.625,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.evening,47.29569147973385,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.night,21.192683870313836,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.day,46.59679621773381,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.peak,46.3816611088,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.evening,27.63966804055385,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,winter.evening,62.1222918432,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.night,47.139234417420006,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.day,83.66329694848,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.peak,57.50161129244002,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,peak.evening,42.466268404020006,-0.0,0.0 2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,summer.night,0.0,-0.0,3.0587449299999996 2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.night,12.342934260933838,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.day,22.041522451893826,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.peak,44.87284439557999,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.evening,18.688115346973845,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.night,38.28948480804001,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.day,59.10802318264001,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.peak,55.99279457922,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,4,,RGASBR,GBR,autumn.evening,33.51471571044,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.day,0.0,-0.0,0.0 2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,3.0587449299999996 2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,winter.night,29.165208466660005,-3.0587449299999996,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,winter.day,41.664583466660005,-5.5645369,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,winter.peak,12.499375,-5.5645369,0.0 @@ -351,38 +351,38 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,autumn.day,41.664583466660005,-3.0587449299999996,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,autumn.peak,11.011804856306647,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,5,,RELCHP,GBR,autumn.evening,13.614407532525505,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.night,12.179665608293831,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.day,153.60894769845382,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.night,38.1262161554,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.day,190.6754484292,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.peak,90.625,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.evening,47.29569147973385,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.night,0.45703953050236734,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.day,46.59679621773381,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.peak,46.3816611088,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.evening,15.169545241797687,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,winter.evening,62.1222918432,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.night,26.403590077608538,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.day,83.66329694848,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.peak,57.50161129244002,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,peak.evening,29.99614560526384,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.day,22.041522451893826,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.peak,33.86103953927334,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.evening,5.073707814448342,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.night,15.265271042411989,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.day,59.10802318264001,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.peak,44.98098972291336,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4,,RGASBR,GBR,autumn.evening,19.900308177914496,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.day,0.0,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.night,15.265271042411989,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.night,4.435312795545212,-7.593309,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.day,5.644611337161978,-0.0,0.0 2030,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.peak,1.8667675484604862,-0.0,0.0 @@ -848,9 +848,9 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.night,4.435312795545212,-7.593309,0.0 -2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.day,5.644437321740924,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.peak,1.8667198614838396,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.evening,2.5561641471069927,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.day,5.644615774661988,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.peak,1.8667695797104864,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.evening,2.556228958367154,-0.0,0.0 2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.night,2.851272517283696,-16.862233030303035,0.0 2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.day,6.3713620320039785,-7.593309,0.0 2030,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.peak,1.7776452018191917,-7.593309,0.0 @@ -884,7 +884,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.night,0.7254164865027733,-9.268924030303033,0.0 -2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.day,0.0792024330831855,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.day,0.0795309747509035,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.peak,0.31084997457203545,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.evening,0.41452370799423743,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.night,0.0,-0.0,7.593309 @@ -892,16 +892,16 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.night,0.7254164865027733,-9.268924030303033,0.0 -2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.day,0.8725296035530924,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.day,0.8722010618853744,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.peak,0.31089277850853586,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.evening,0.41452370799423743,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.day,175.9517089499986,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.day,175.95168394999848,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,peak.day,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,peak.peak,71.90491883633823,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,peak.peak,71.90494383633832,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 @@ -909,48 +909,48 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.evening,1e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.peak,6.037550322518157,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.peak,6.037550322518156,-0.0,0.0 2030,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.day,182.48716517882406,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.day,182.4871401788239,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.peak,74.20754618448075,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.peak,74.20752118448061,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.evening,2.05e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.peak,5.046784244969558,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.peak,5.0468092449696655,-0.0,0.0 2030,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.day,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.peak,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.evening,0.0,-0.0,-2.220446049250313e-16 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.evening,2.05e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.day,0.0,-0.0,-2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.peak,0.0,-0.0,-2.220446049250313e-16 +2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,peak.evening,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 @@ -960,9 +960,9 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593309,0.0 -2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.day,0.00017845292106438267,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-0.0,0.0 -2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.evening,0.00006481126016157341,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.night,0.00007191386388174911,-16.862233030303035,0.0 2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.day,0.00016069641156131185,-7.593309,0.0 2030,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.peak,0.000044835186499625,-7.593309,0.0 @@ -980,7 +980,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.268924030303033,0.0 -2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,peak.evening,0.000131416667718,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.night,0.0,-0.0,7.593309 @@ -988,7 +988,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.night,0.00022997916771800003,-9.268924030303033,0.0 -2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.day,0.0,-0.0,0.0 +2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.day,0.00032854166771800004,-0.0,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.peak,0.0000985625,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,,,GASCGT,GBR,autumn.evening,0.000131416667718,-9.268924030303033,0.0 2030,ironing out iteration 0; final with candidates,,,RGASBR,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 @@ -1152,7 +1152,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final without candidates,8,,GASCGT,GBR,autumn.peak,0.31089277850853586,-9.268924030303033,0.0 2030,final without candidates,8,,GASCGT,GBR,autumn.evening,0.41452370799423743,-9.268924030303033,0.0 2030,final with candidates,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2030,final with candidates,0,,GASDRV,GBR,winter.day,182.48714017882395,-0.0,0.0 +2030,final with candidates,0,,GASDRV,GBR,winter.day,182.48716517882406,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 @@ -1165,7 +1165,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,0,,GASDRV,GBR,summer.evening,2.05e-6,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2030,final with candidates,0,,GASDRV,GBR,autumn.peak,5.04678424496953,-0.0,0.0 +2030,final with candidates,0,,GASDRV,GBR,autumn.peak,5.046809244969637,-0.0,0.0 2030,final with candidates,0,,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 2030,final with candidates,1,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,winter.day,175.9516839499985,-0.0,0.0 @@ -1173,20 +1173,20 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,1,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,peak.day,0.0,-0.0,-2.220446049250313e-16 -2030,final with candidates,1,,GASPRC,GBR,peak.peak,71.9049188363382,-0.0,0.0 +2030,final with candidates,1,,GASPRC,GBR,peak.peak,71.9049438363383,-0.0,0.0 2030,final with candidates,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 -2030,final with candidates,1,,GASPRC,GBR,summer.evening,1e-6,-0.0,0.0 +2030,final with candidates,1,,GASPRC,GBR,summer.evening,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,1,,GASPRC,GBR,autumn.peak,6.037550322518143,-0.0,0.0 2030,final with candidates,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2030,final with candidates,2,,WNDFRM,GBR,winter.night,4.435312795545212,-7.593309,0.0 -2030,final with candidates,2,,WNDFRM,GBR,winter.day,5.644437321740923,-0.0,0.0 -2030,final with candidates,2,,WNDFRM,GBR,winter.peak,1.8667198614838398,-0.0,0.0 -2030,final with candidates,2,,WNDFRM,GBR,winter.evening,2.5561641471069922,-0.0,0.0 +2030,final with candidates,2,,WNDFRM,GBR,winter.day,5.644615774661987,-0.0,0.0 +2030,final with candidates,2,,WNDFRM,GBR,winter.peak,1.8667695797104866,-0.0,0.0 +2030,final with candidates,2,,WNDFRM,GBR,winter.evening,2.5562289583671536,-0.0,0.0 2030,final with candidates,2,,WNDFRM,GBR,peak.night,2.851272517283696,-16.862233030303035,0.0 2030,final with candidates,2,,WNDFRM,GBR,peak.day,6.3713620320039785,-7.593309,0.0 2030,final with candidates,2,,WNDFRM,GBR,peak.peak,1.7776452018191917,-7.593309,0.0 @@ -1263,12 +1263,12 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,7,,WNDFRM,GBR,autumn.day,6.874883368104711,-7.593309,0.0 2030,final with candidates,7,,WNDFRM,GBR,autumn.peak,1.7741634415088408,-16.862233030303035,0.0 2030,final with candidates,7,,WNDFRM,GBR,autumn.evening,2.177382426366188,-16.862233030303035,0.0 -2030,final with candidates,8,,GASCGT,GBR,winter.night,0.1083085925340924,-0.0,0.0 +2030,final with candidates,8,,GASCGT,GBR,winter.night,0.1085385717018104,-0.0,0.0 2030,final with candidates,8,,GASCGT,GBR,winter.day,0.0,-0.0,7.593309 2030,final with candidates,8,,GASCGT,GBR,winter.peak,0.0,-0.0,7.593309 2030,final with candidates,8,,GASCGT,GBR,winter.evening,0.0,-0.0,7.593309 2030,final with candidates,8,,GASCGT,GBR,peak.night,0.7254164865027733,-9.268924030303033,0.0 -2030,final with candidates,8,,GASCGT,GBR,peak.day,0.0792024330831855,-0.0,0.0 +2030,final with candidates,8,,GASCGT,GBR,peak.day,0.0795309747509035,-0.0,0.0 2030,final with candidates,8,,GASCGT,GBR,peak.peak,0.31084997457203545,-0.0,0.0 2030,final with candidates,8,,GASCGT,GBR,peak.evening,0.41452370799423743,-9.268924030303033,0.0 2030,final with candidates,8,,GASCGT,GBR,summer.night,0.0,-0.0,7.593309 @@ -1276,13 +1276,13 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,8,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,8,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,final with candidates,8,,GASCGT,GBR,autumn.night,0.7254164865027733,-9.268924030303033,0.0 -2030,final with candidates,8,,GASCGT,GBR,autumn.day,0.8725296035530924,-0.0,0.0 +2030,final with candidates,8,,GASCGT,GBR,autumn.day,0.8722010618853744,-0.0,0.0 2030,final with candidates,8,,GASCGT,GBR,autumn.peak,0.31089277850853586,-9.268924030303033,0.0 2030,final with candidates,8,,GASCGT,GBR,autumn.evening,0.41452370799423743,-9.268924030303033,0.0 -2030,final with candidates,,,GASDRV,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,winter.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,winter.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,winter.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 2030,final with candidates,,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 2030,final with candidates,,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 2030,final with candidates,,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 @@ -1291,30 +1291,30 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2030,final with candidates,,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 2030,final with candidates,,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 +2030,final with candidates,,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,winter.evening,4.1666667e-6,-0.0,0.0 -2030,final with candidates,,,GASPRC,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 -2030,final with candidates,,,GASPRC,GBR,peak.day,0.000010416666700000001,-0.0,0.0 -2030,final with candidates,,,GASPRC,GBR,peak.peak,3.125e-6,-0.0,0.0 -2030,final with candidates,,,GASPRC,GBR,peak.evening,4.1666667e-6,-0.0,0.0 +2030,final with candidates,,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 +2030,final with candidates,,,GASPRC,GBR,peak.day,0.0,-0.0,-2.220446049250313e-16 +2030,final with candidates,,,GASPRC,GBR,peak.peak,0.0,-0.0,-2.220446049250313e-16 +2030,final with candidates,,,GASPRC,GBR,peak.evening,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 2030,final with candidates,,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 -2030,final with candidates,,,GASPRC,GBR,summer.evening,0.0,-0.0,-2.220446049250313e-16 +2030,final with candidates,,,GASPRC,GBR,summer.evening,1e-6,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 2030,final with candidates,,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2030,final with candidates,,,WNDFRM,GBR,winter.night,0.00011186601025274165,-7.593309,0.0 -2030,final with candidates,,,WNDFRM,GBR,winter.day,0.00017845292106438267,-0.0,0.0 -2030,final with candidates,,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-0.0,0.0 -2030,final with candidates,,,WNDFRM,GBR,winter.evening,0.00006481126016157341,-0.0,0.0 +2030,final with candidates,,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2030,final with candidates,,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2030,final with candidates,,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 2030,final with candidates,,,WNDFRM,GBR,peak.night,0.00007191386388174911,-16.862233030303035,0.0 2030,final with candidates,,,WNDFRM,GBR,peak.day,0.00016069641156131185,-7.593309,0.0 2030,final with candidates,,,WNDFRM,GBR,peak.peak,0.000044835186499625,-7.593309,0.0 @@ -1327,12 +1327,12 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-7.593309,0.0 2030,final with candidates,,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-16.862233030303035,0.0 2030,final with candidates,,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-16.862233030303035,0.0 -2030,final with candidates,,,GASCGT,GBR,winter.night,0.00022997916771800003,-0.0,0.0 +2030,final with candidates,,,GASCGT,GBR,winter.night,0.0,-0.0,0.0 2030,final with candidates,,,GASCGT,GBR,winter.day,0.0,-0.0,7.593309 2030,final with candidates,,,GASCGT,GBR,winter.peak,0.0,-0.0,7.593309 2030,final with candidates,,,GASCGT,GBR,winter.evening,0.0,-0.0,7.593309 2030,final with candidates,,,GASCGT,GBR,peak.night,0.00022997916771800003,-9.268924030303033,0.0 -2030,final with candidates,,,GASCGT,GBR,peak.day,0.00032854166771800004,-0.0,0.0 +2030,final with candidates,,,GASCGT,GBR,peak.day,0.0,-0.0,0.0 2030,final with candidates,,,GASCGT,GBR,peak.peak,0.0,-0.0,0.0 2030,final with candidates,,,GASCGT,GBR,peak.evening,0.000131416667718,-9.268924030303033,0.0 2030,final with candidates,,,GASCGT,GBR,summer.night,0.0,-0.0,7.593309 @@ -1340,7 +1340,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,,,GASCGT,GBR,summer.peak,0.0,-0.0,7.593309 2030,final with candidates,,,GASCGT,GBR,summer.evening,0.0,-0.0,7.593309 2030,final with candidates,,,GASCGT,GBR,autumn.night,0.00022997916771800003,-9.268924030303033,0.0 -2030,final with candidates,,,GASCGT,GBR,autumn.day,0.0,-0.0,0.0 +2030,final with candidates,,,GASCGT,GBR,autumn.day,0.00032854166771800004,-0.0,0.0 2030,final with candidates,,,GASCGT,GBR,autumn.peak,0.0000985625,-9.268924030303033,0.0 2030,final with candidates,,,GASCGT,GBR,autumn.evening,0.000131416667718,-9.268924030303033,0.0 2030,final with candidates,,,RGASBR,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 @@ -1377,9 +1377,9 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2030,final with candidates,,,RELCHP,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,winter.peak,11.118359432844716,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,winter.peak,11.119950183640015,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,peak.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 @@ -1387,7 +1387,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,autumn.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,6,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 @@ -1395,37 +1395,37 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,winter.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.5645369,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,winter.evening,4.6995376818363015,-5.5645369,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.night,8.224190915016303,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.night,0.0,-0.0,8.881784197001252e-16 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.day,11.748844148196303,-3.0587449299999996,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.peak,3.5246532331800005,-3.0587449299999996,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.evening,4.6995376818363015,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,peak.evening,0.0,-0.0,8.881784197001252e-16 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,summer.night,6.424223861080001,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,summer.day,10.70353850198,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,summer.peak,3.5246532331800005,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,summer.evening,2.62438618894,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.night,8.224190915016303,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.night,0.0,-0.0,8.881784197001252e-16 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.day,11.748844148196303,-3.0587449299999996,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.peak,3.5246532331800005,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.evening,4.6995376818363015,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.peak,0.0,-0.0,8.881784197001252e-16 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RELCHP,GBR,autumn.evening,0.0,-0.0,8.881784197001252e-16 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.peak,110.71968956682,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.night,51.727530317420005,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.peak,62.16992667561999,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,peak.evening,31.773120940553852,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.night,42.016390608040005,-0.0,0.0 2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 -2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.peak,50.32290129557999,-0.0,0.0 +2040,ironing out iteration 0; post RSHEAT|GBR investment,,,RGASBR,GBR,autumn.evening,21.950269146973845,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,winter.peak,11.118359432844716,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,winter.peak,11.119950183640015,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 @@ -1433,7 +1433,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 -2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,summer.peak,-0.0,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 @@ -1457,7 +1457,7 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RELCHP,GBR,autumn.evening,4.6995376818363015,-5.5645369,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.peak,110.71968956682,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 @@ -1465,60 +1465,60 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 -2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.peak,-0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.night,0.24502568706609473,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,2,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,summer.evening,0.8660474423502,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post ELCTRI|GBR investment,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.day,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.peak,11.118359432844713,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,6,,RGASBR,GBR,autumn.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,winter.night,8.224190915016303,-5.5645369,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,winter.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.5645369,0.0 @@ -1535,86 +1535,86 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,autumn.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,autumn.peak,3.5246532331800005,-5.5645369,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RELCHP,GBR,autumn.evening,4.6995376818363015,-5.5645369,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.night,65.6170424070437,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.day,243.20599744766372,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.peak,62.16992667561999,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,winter.evening,81.75742732802371,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.night,43.503339402403704,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.day,125.77782156694371,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.peak,73.28987685926,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,peak.evening,41.900183622183704,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.night,33.792199693023704,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.day,98.83246100110371,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.peak,57.918198246040006,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,,,RGASBR,GBR,autumn.evening,32.0773318286037,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.night,0.24502568706609473,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,2,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,summer.evening,0.8660474423502,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.day,313.50280921245985,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.day,313.5028092124596,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,winter.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,peak.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,peak.day,51.36159090769979,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.night,0.0,-0.0,2.9170059999999998 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.day,0.0,-0.0,2.9170059999999998 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.peak,0.0,-0.0,2.9170059999999998 -2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.evening,0.0,-0.0,2.9170059999999998 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,summer.evening,-0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,autumn.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,autumn.day,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,autumn.peak,98.42446812337678,-0.0,0.0 2040,ironing out iteration 0; post GASNAT|GBR investment,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.day,0.0,-0.0,-4.440892098500626e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.peak,11.118359432844713,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,winter.evening,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.day,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.peak,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,peak.evening,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.day,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.peak,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,6,,RGASBR,GBR,autumn.evening,0.0,-0.0,-4.440892098500626e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,winter.night,8.224190915016303,-5.5645369,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,winter.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.564536900000001,0.0 @@ -1631,102 +1631,102 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,autumn.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,autumn.peak,3.5246532331800005,-5.5645369,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RELCHP,GBR,autumn.evening,4.6995376818363015,-5.5645369,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.night,65.6170424070437,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.day,243.20599744766372,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.peak,62.16992667561999,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,winter.evening,81.75742732802371,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.night,43.503339402403704,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.day,125.77782156694371,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.peak,73.28987685926,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,peak.evening,41.900183622183704,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.night,33.792199693023704,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.day,98.83246100110371,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.peak,57.918198246040006,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,,,RGASBR,GBR,autumn.evening,32.0773318286037,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.night,0.24502568706609473,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,2,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,summer.evening,0.8660474423502,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.night,0.0,-0.0,-1.1102230246251565e-16 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.day,313.5028092124598,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.day,313.5028092124596,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.peak,0.0,-0.0,-1.1102230246251565e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,winter.evening,0.0,-0.0,-1.1102230246251565e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,peak.night,0.0,-0.0,-1.1102230246251565e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,peak.day,51.36159090769979,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.night,0.0,-0.0,0.60226 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.day,0.0,-0.0,0.60226 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.peak,0.0,-0.0,0.60226 -2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.evening,0.0,-0.0,0.60226 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.night,0.0,-0.0,-1.1102230246251565e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.day,0.0,-0.0,-1.1102230246251565e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.peak,0.0,-0.0,-1.1102230246251565e-16 +2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,summer.evening,-0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-1.1102230246251565e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-1.1102230246251565e-16 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,autumn.peak,98.42446812337678,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,winter.day,326.91581945440834,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,winter.day,326.9158194544082,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,peak.day,51.667540234410296,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.night,0.0,-0.0,2.20452 -2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.day,0.0,-0.0,2.20452 -2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.peak,0.0,-0.0,2.20452 -2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.evening,0.0,-0.0,2.20452 +2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,summer.evening,-0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,autumn.peak,102.0530456858711,-0.0,0.0 2040,ironing out iteration 0; post GASPRD|GBR investment,0,,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.day,0.0,-0.0,-4.440892098500626e-16 2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.peak,11.118359432844713,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,winter.evening,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.day,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.peak,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,peak.evening,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.night,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.day,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.peak,0.0,-0.0,-4.440892098500626e-16 +2040,ironing out iteration 0; final without candidates,6,,RGASBR,GBR,autumn.evening,0.0,-0.0,-4.440892098500626e-16 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,winter.night,8.224190915016303,-5.5645369,0.0 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,winter.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.564536900000001,0.0 @@ -1743,82 +1743,82 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,autumn.day,11.748844148196303,-5.5645369,0.0 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,autumn.peak,3.5246532331800005,-5.5645369,0.0 2040,ironing out iteration 0; final without candidates,,,RELCHP,GBR,autumn.evening,4.6995376818363015,-5.5645369,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.night,65.6170424070437,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.day,243.20599744766372,-0.0,0.0 2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.peak,62.16992667561999,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,winter.evening,81.75742732802371,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.night,43.503339402403704,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.day,125.77782156694371,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.peak,73.28987685926,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,peak.evening,41.900183622183704,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.night,33.792199693023704,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.day,98.83246100110371,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.peak,57.918198246040006,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,,,RGASBR,GBR,autumn.evening,32.0773318286037,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.night,0.24502568706609473,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,2,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,summer.evening,0.8660474423502,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.day,313.5028092124598,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.day,313.5028092124596,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.peak,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,winter.evening,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,peak.day,51.36159090769979,-0.0,0.0 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,0.60226 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,0.60226 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,0.60226 -2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.evening,0.0,-0.0,0.60226 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,summer.evening,-0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,autumn.peak,98.42446812337678,-0.0,0.0 2040,ironing out iteration 0; final without candidates,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,winter.day,326.91581945440834,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,winter.day,326.9158194544082,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,peak.day,51.667540234410296,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 -2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,2.20452 -2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,2.20452 -2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,2.20452 -2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.evening,0.0,-0.0,2.20452 +2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,summer.evening,-0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2040,ironing out iteration 0; final without candidates,0,,GASDRV,GBR,autumn.peak,102.0530456858711,-0.0,0.0 @@ -1871,38 +1871,38 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; final with candidates,,,RGASBR,GBR,autumn.day,61.76594985369082,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,RGASBR,GBR,autumn.peak,46.79824493739999,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,RGASBR,GBR,autumn.evening,17.250727298470846,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.night,0.24498540318142714,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.night,2.713986408205391,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.day,3.877123006404791,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.peak,1.1631375981994003,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,winter.evening,1.5508498100059904,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.night,2.713986408205391,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.day,3.877123006404791,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.peak,1.1631375981994003,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,peak.evening,1.5508498100059904,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.night,0.24502668706609487,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.day,3.5321687056534,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.peak,1.1631365669494003,-0.0,0.0 2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.night,2.7138745421951382,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.day,3.876944553483727,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.peak,1.1630878799727538,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.evening,1.5507849987458289,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.night,2.7139144943415094,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.day,3.8769623099932295,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.peak,1.1630927630129007,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.evening,1.5508063065573348,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.night,2.713986408205391,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.day,3.877123006404791,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.peak,1.1631375981994003,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,2,,WNDFRM,GBR,autumn.evening,1.5508498100059904,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.day,3.5320537322539898,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.peak,1.163102829581354,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.evening,0.8660218075857518,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.night,2.7139056160868114,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.day,3.8769716321606698,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.peak,1.16309853387852,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.evening,1.550801867429905,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,summer.evening,0.8660484423502,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.day,313.5027564624596,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 @@ -1914,43 +1914,43 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.evening,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,summer.evening,1e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.peak,98.42441537337658,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.peak,98.42444037337667,-0.0,0.0 2040,ironing out iteration 0; final with candidates,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.day,326.91579131690827,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.day,51.667512096910116,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.day,51.66748709691001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.evening,2.05e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.peak,102.05301754837097,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.peak,102.05299254837087,-0.0,0.0 2040,ironing out iteration 0; final with candidates,0,,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.day,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.peak,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,winter.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,peak.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.evening,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.peak,0.0,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,summer.evening,2.05e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.peak,3.125e-6,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASDRV,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.night,7.291666700000001e-6,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.day,0.000010416666700000001,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,winter.peak,3.125e-6,-0.0,0.0 @@ -1962,27 +1962,27 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 -2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.evening,1e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.night,7.291666700000001e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.day,0.000010416666700000001,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.peak,3.125e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.evening,4.1666667e-6,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.night,0.00011186601025274165,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.day,0.00017845292106438267,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.peak,0.000049718226646625005,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.evening,0.00006481126016157341,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.night,0.00007191386388174911,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.day,0.00016069641156131185,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.peak,0.000044835186499625,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.evening,0.00004350344865561091,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.night,0.00004128388466768467,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.day,0.00011497339941020655,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.peak,0.0000337373680464375,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.evening,0.000026634764448161445,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.night,0.00008079211857975206,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.day,0.00015137424412148091,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.peak,0.000039064320880312505,-0.0,0.0 -2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.evening,0.0000479425760855406,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,summer.evening,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.peak,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,,GASPRC,GBR,autumn.evening,0.0,-0.0,-2.220446049250313e-16 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,ironing out iteration 0; final with candidates,,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 2040,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.night,0.0,-0.0,7.593309 2040,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.day,0.0,-0.0,7.593309 2040,ironing out iteration 0; final with candidates,,,GASCGT,GBR,winter.peak,0.0,-0.0,7.593309 @@ -2032,88 +2032,88 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,ironing out iteration 0; final with candidates,,,RELCHP,GBR,autumn.peak,3.125e-6,-5.5645369,0.0 2040,ironing out iteration 0; final with candidates,,,RELCHP,GBR,autumn.evening,4.1666667e-6,-5.5645369,0.0 2040,final without candidates,0,,GASDRV,GBR,winter.night,0.0,-0.0,0.0 -2040,final without candidates,0,,GASDRV,GBR,winter.day,326.9158194544082,-0.0,0.0 +2040,final without candidates,0,,GASDRV,GBR,winter.day,326.91581945440834,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,winter.peak,125.070625,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,winter.evening,166.76083466742,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,peak.night,0.0,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,peak.day,51.667540234410296,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,peak.peak,125.070625,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,peak.evening,166.76083466742,-0.0,0.0 -2040,final without candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,2.20452 -2040,final without candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,2.20452 -2040,final without candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,2.20452 -2040,final without candidates,0,,GASDRV,GBR,summer.evening,0.0,-0.0,2.20452 +2040,final without candidates,0,,GASDRV,GBR,summer.night,0.0,-0.0,0.0 +2040,final without candidates,0,,GASDRV,GBR,summer.day,0.0,-0.0,0.0 +2040,final without candidates,0,,GASDRV,GBR,summer.peak,0.0,-0.0,0.0 +2040,final without candidates,0,,GASDRV,GBR,summer.evening,-0.0,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,autumn.night,0.0,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,autumn.day,0.0,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,autumn.peak,102.0530456858711,-0.0,0.0 2040,final without candidates,0,,GASDRV,GBR,autumn.evening,166.76083466742,-0.0,0.0 -2040,final without candidates,1,,GASPRC,GBR,winter.night,0.0,-0.0,-2.220446049250313e-16 +2040,final without candidates,1,,GASPRC,GBR,winter.night,275.78031376071004,-0.0,0.0 2040,final without candidates,1,,GASPRC,GBR,winter.day,313.50280921245974,-0.0,0.0 -2040,final without candidates,1,,GASPRC,GBR,winter.peak,118.1915625,-0.0,0.0 -2040,final without candidates,1,,GASPRC,GBR,winter.evening,157.58875126070998,-0.0,0.0 +2040,final without candidates,1,,GASPRC,GBR,winter.peak,0.0,-0.0,-2.220446049250313e-16 +2040,final without candidates,1,,GASPRC,GBR,winter.evening,0.0,-0.0,-2.220446049250313e-16 2040,final without candidates,1,,GASPRC,GBR,peak.night,0.0,-0.0,-2.220446049250313e-16 2040,final without candidates,1,,GASPRC,GBR,peak.day,51.36159090769979,-0.0,0.0 2040,final without candidates,1,,GASPRC,GBR,peak.peak,118.1915625,-0.0,0.0 2040,final without candidates,1,,GASPRC,GBR,peak.evening,157.58875126070998,-0.0,0.0 -2040,final without candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,0.60226 -2040,final without candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,0.60226 -2040,final without candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,0.60226 -2040,final without candidates,1,,GASPRC,GBR,summer.evening,0.0,-0.0,0.60226 +2040,final without candidates,1,,GASPRC,GBR,summer.night,0.0,-0.0,-2.220446049250313e-16 +2040,final without candidates,1,,GASPRC,GBR,summer.day,0.0,-0.0,-2.220446049250313e-16 +2040,final without candidates,1,,GASPRC,GBR,summer.peak,0.0,-0.0,-2.220446049250313e-16 +2040,final without candidates,1,,GASPRC,GBR,summer.evening,-0.0,-0.0,0.0 2040,final without candidates,1,,GASPRC,GBR,autumn.night,0.0,-0.0,-2.220446049250313e-16 2040,final without candidates,1,,GASPRC,GBR,autumn.day,0.0,-0.0,-2.220446049250313e-16 2040,final without candidates,1,,GASPRC,GBR,autumn.peak,98.42446812337678,-0.0,0.0 2040,final without candidates,1,,GASPRC,GBR,autumn.evening,157.58875126070998,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 2040,final without candidates,2,,WNDFRM,GBR,summer.night,0.24502568706609473,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 2040,final without candidates,2,,WNDFRM,GBR,summer.evening,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 -2040,final without candidates,2,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,winter.night,25.94655054710617,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,winter.day,37.066500730746185,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 +2040,final without candidates,2,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,final without candidates,6,,RGASBR,GBR,winter.night,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,winter.day,0.0,-0.0,-4.440892098500626e-16 2040,final without candidates,6,,RGASBR,GBR,winter.peak,11.118359432844716,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,winter.evening,14.826600363466154,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,peak.night,25.94655054710617,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,peak.day,37.066500730746185,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,peak.peak,11.119950183640015,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,peak.evening,14.826600363466154,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,final without candidates,6,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,final without candidates,6,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,final without candidates,6,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,final without candidates,6,,RGASBR,GBR,autumn.night,25.94655054710617,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,autumn.day,37.066500730746185,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,autumn.peak,11.119950183640015,-0.0,0.0 -2040,final without candidates,6,,RGASBR,GBR,autumn.evening,14.826600363466154,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,winter.night,2.71398300195538,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,winter.day,3.8771185689047805,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,winter.peak,1.1631355669494001,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,winter.evening,1.5508474350059795,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,peak.night,2.71398300195538,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,peak.day,3.8771185689047805,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,peak.peak,1.1631355669494001,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,peak.evening,1.5508474350059795,-0.0,0.0 +2040,final without candidates,6,,RGASBR,GBR,winter.evening,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,peak.night,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,peak.day,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,peak.peak,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,peak.evening,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,final without candidates,6,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,final without candidates,6,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,final without candidates,6,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,final without candidates,6,,RGASBR,GBR,autumn.night,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,autumn.day,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,autumn.peak,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,6,,RGASBR,GBR,autumn.evening,0.0,-0.0,-4.440892098500626e-16 +2040,final without candidates,7,,WNDFRM,GBR,winter.night,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,winter.day,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,winter.peak,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,winter.evening,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,peak.night,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,peak.day,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,peak.peak,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,peak.evening,0.0,-0.0,0.0 2040,final without candidates,7,,WNDFRM,GBR,summer.night,1.8749681870903054,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,summer.day,3.5321677056534004,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,summer.peak,1.1631355669494001,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,summer.day,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,summer.peak,0.0,-0.0,0.0 2040,final without candidates,7,,WNDFRM,GBR,summer.evening,0.8660474423502,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,autumn.night,2.71398300195538,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,autumn.day,3.8771185689047805,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,autumn.peak,1.1631355669494001,-0.0,0.0 -2040,final without candidates,7,,WNDFRM,GBR,autumn.evening,1.5508474350059795,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,autumn.night,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,autumn.day,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,autumn.peak,0.0,-0.0,0.0 +2040,final without candidates,7,,WNDFRM,GBR,autumn.evening,0.0,-0.0,0.0 2040,final without candidates,9,,RELCHP,GBR,winter.night,8.224190915016303,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,winter.day,11.748844148196303,-5.5645369,0.0 -2040,final without candidates,9,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.564536900000001,0.0 +2040,final without candidates,9,,RELCHP,GBR,winter.peak,3.5246532331800005,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,winter.evening,4.6995376818363015,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,peak.night,8.224190915016303,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,peak.day,11.748844148196303,-5.5645369,0.0 @@ -2127,19 +2127,19 @@ milestone_year,run_description,asset_id,group_id,process_id,region_id,time_slice 2040,final without candidates,9,,RELCHP,GBR,autumn.day,11.748844148196303,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,autumn.peak,3.5246532331800005,-5.5645369,0.0 2040,final without candidates,9,,RELCHP,GBR,autumn.evening,4.6995376818363015,-5.5645369,0.0 -2040,final without candidates,10,,RGASBR,GBR,winter.night,39.670491859937535,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,winter.day,206.13949671691753,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,winter.night,65.6170424070437,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,winter.day,243.20599744766372,-0.0,0.0 2040,final without candidates,10,,RGASBR,GBR,winter.peak,110.7212803176153,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,winter.evening,66.93082696455755,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,peak.night,17.556788855297533,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,peak.day,88.71132083619753,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,peak.peak,62.16992667561999,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,peak.evening,27.07358325871755,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,summer.night,0.0,-0.0,2.2099800000000003 -2040,final without candidates,10,,RGASBR,GBR,summer.day,0.0,-0.0,2.2099800000000003 -2040,final without candidates,10,,RGASBR,GBR,summer.peak,0.0,-0.0,2.2099800000000003 -2040,final without candidates,10,,RGASBR,GBR,summer.evening,0.0,-0.0,2.2099800000000003 -2040,final without candidates,10,,RGASBR,GBR,autumn.night,7.845649145917532,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,autumn.day,61.76596027035752,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,autumn.peak,46.79824806239999,-0.0,0.0 -2040,final without candidates,10,,RGASBR,GBR,autumn.evening,17.250731465137545,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,winter.evening,81.75742732802371,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,peak.night,43.503339402403704,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,peak.day,125.77782156694371,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,peak.peak,73.28987685926,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,peak.evening,41.900183622183704,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,summer.night,0.0,-0.0,5.5645369 +2040,final without candidates,10,,RGASBR,GBR,summer.day,0.0,-0.0,5.5645369 +2040,final without candidates,10,,RGASBR,GBR,summer.peak,0.0,-0.0,5.5645369 +2040,final without candidates,10,,RGASBR,GBR,summer.evening,0.0,-0.0,5.5645369 +2040,final without candidates,10,,RGASBR,GBR,autumn.night,33.792199693023704,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,autumn.day,98.83246100110371,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,autumn.peak,57.918198246040006,-0.0,0.0 +2040,final without candidates,10,,RGASBR,GBR,autumn.evening,32.0773318286037,-0.0,0.0 diff --git a/tests/data/simple/debug_solver.csv b/tests/data/simple/debug_solver.csv index 13c05f1eb..71aae6934 100644 --- a/tests/data/simple/debug_solver.csv +++ b/tests/data/simple/debug_solver.csv @@ -1,8 +1,8 @@ milestone_year,run_description,objective_value 2020,final without candidates,4132.120065800382 2020,final with candidates,4132.101601547164 -2030,ironing out iteration 0; post RSHEAT|GBR investment,5324.82265531636 -2030,ironing out iteration 0; post ELCTRI|GBR investment,4399.6222766807 +2030,ironing out iteration 0; post RSHEAT|GBR investment,5324.822655316363 +2030,ironing out iteration 0; post ELCTRI|GBR investment,4399.6222766806995 2030,ironing out iteration 0; post GASNAT|GBR investment,4399.6222766806995 2030,ironing out iteration 0; post GASPRD|GBR investment,4399.6222766807 2030,ironing out iteration 0; final without candidates,4399.6222766807 @@ -10,9 +10,9 @@ milestone_year,run_description,objective_value 2030,final without candidates,4399.622276680701 2030,final with candidates,4399.60627586809 2040,ironing out iteration 0; post RSHEAT|GBR investment,6265.340898231358 -2040,ironing out iteration 0; post ELCTRI|GBR investment,6013.578227960084 -2040,ironing out iteration 0; post GASNAT|GBR investment,6013.578227960086 +2040,ironing out iteration 0; post ELCTRI|GBR investment,6013.5782279600835 +2040,ironing out iteration 0; post GASNAT|GBR investment,6013.578227960085 2040,ironing out iteration 0; post GASPRD|GBR investment,6013.578227960086 2040,ironing out iteration 0; final without candidates,6013.578227960086 -2040,ironing out iteration 0; final with candidates,6013.577837505924 -2040,final without candidates,6013.5782279600835 +2040,ironing out iteration 0; final with candidates,6013.577837505922 +2040,final without candidates,6013.578227960088 diff --git a/tests/data/simple_divisible/asset_capacities.csv b/tests/data/simple_divisible/asset_capacities.csv index f6b3a19ca..45b38ce34 100644 --- a/tests/data/simple_divisible/asset_capacities.csv +++ b/tests/data/simple_divisible/asset_capacities.csv @@ -8,20 +8,19 @@ milestone_year,asset_id,group_id,capacity,num_units 2030,0,,4002.26, 2030,1,,3782.13, 2030,2,,3.964844, -2030,3,,2.43, 2030,,0,3000.0,3 2030,7,,399.98, 2030,8,,255.83840587648046, -2030,9,,10.373026691324002, +2030,9,,9.8487022064078, +2030,10,,0.5781084152151111, 2040,0,,4002.26, 2040,1,,3782.13, 2040,2,,3.964844, -2040,3,,2.43, 2040,8,,255.83840587648046, -2040,9,,10.373026691324002, -2040,10,,845.534995772325, +2040,9,,9.8487022064078, +2040,10,,0.5781084152151111, +2040,11,,845.534995772325, 2040,,1,3000.0,3 -2040,14,,9.221902943312408, -2040,15,,1.3300231036173256, -2040,16,,337.4266352194902, -2040,17,,354.29796698046476, +2040,15,,9.383159803807807, +2040,16,,0.3934850438118198, +2040,17,,417.3831664706085, diff --git a/tests/data/simple_divisible/assets.csv b/tests/data/simple_divisible/assets.csv index f27298ee8..4300b5391 100644 --- a/tests/data/simple_divisible/assets.csv +++ b/tests/data/simple_divisible/assets.csv @@ -7,9 +7,9 @@ asset_id,group_id,process_id,region_id,agent_id,commission_year 7,,RELCHP,GBR,A0_RES,2020 8,,RELCHP,GBR,A0_RES,2030 9,,WNDFRM,GBR,A0_ELC,2030 -10,,RELCHP,GBR,A0_RES,2040 +10,,GASCGT,GBR,A0_ELC,2030 +11,,RELCHP,GBR,A0_RES,2040 ,1,RGASBR,GBR,A0_RES,2040 -14,,WNDFRM,GBR,A0_ELC,2040 -15,,GASCGT,GBR,A0_ELC,2040 -16,,GASPRC,GBR,A0_GPR,2040 +15,,WNDFRM,GBR,A0_ELC,2040 +16,,GASCGT,GBR,A0_ELC,2040 17,,GASDRV,GBR,A0_GEX,2040 diff --git a/tests/data/simple_divisible/commodity_flows.csv b/tests/data/simple_divisible/commodity_flows.csv index a84baed96..b8eea6647 100644 --- a/tests/data/simple_divisible/commodity_flows.csv +++ b/tests/data/simple_divisible/commodity_flows.csv @@ -225,8 +225,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2020,,0,CO2EMT,autumn.evening,871.1363400340363 2030,0,,GASPRD,winter.night,0.0 2030,0,,CO2EMT,winter.night,0.0 -2030,0,,GASPRD,winter.day,105.0850259830064 -2030,0,,CO2EMT,winter.day,537.2997378511118 +2030,0,,GASPRD,winter.day,105.70358712274958 +2030,0,,CO2EMT,winter.day,540.4624409586187 2030,0,,GASPRD,winter.peak,125.070625 2030,0,,CO2EMT,winter.peak,639.486105625 2030,0,,GASPRD,winter.evening,166.76083466742 @@ -235,10 +235,10 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,0,,CO2EMT,peak.night,0.0 2030,0,,GASPRD,peak.day,0.0 2030,0,,CO2EMT,peak.day,0.0 -2030,0,,GASPRD,peak.peak,0.0 -2030,0,,CO2EMT,peak.peak,0.0 -2030,0,,GASPRD,peak.evening,160.07186127462782 -2030,0,,CO2EMT,peak.evening,818.4474266971721 +2030,0,,GASPRD,peak.peak,8.81114770601343 +2030,0,,CO2EMT,peak.peak,45.051398220846664 +2030,0,,GASPRD,peak.evening,166.76083466742 +2030,0,,CO2EMT,peak.evening,852.6481476545185 2030,0,,GASPRD,summer.night,0.0 2030,0,,CO2EMT,summer.night,0.0 2030,0,,GASPRD,summer.day,0.0 @@ -253,14 +253,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,0,,CO2EMT,autumn.day,0.0 2030,0,,GASPRD,autumn.peak,0.0 2030,0,,CO2EMT,autumn.peak,0.0 -2030,0,,GASPRD,autumn.evening,97.71651923768705 -2030,0,,CO2EMT,autumn.evening,499.62456286229394 +2030,0,,GASPRD,autumn.evening,105.72529889958477 +2030,0,,CO2EMT,autumn.evening,540.573453273577 2030,1,,GASPRD,winter.night,-0.0 2030,1,,GASNAT,winter.night,0.0 2030,1,,CO2EMT,winter.night,0.0 -2030,1,,GASPRD,winter.day,-107.3471562016809 -2030,1,,GASNAT,winter.day,102.23538685874371 -2030,1,,CO2EMT,winter.day,261.36476650437834 +2030,1,,GASPRD,winter.day,-107.9657173414241 +2030,1,,GASNAT,winter.day,102.82449270611818 +2030,1,,CO2EMT,winter.day,262.87081560319115 2030,1,,GASPRD,winter.peak,-124.10114062500001 2030,1,,GASNAT,winter.peak,118.1915625 2030,1,,CO2EMT,winter.peak,302.15672953125005 @@ -273,12 +273,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,1,,GASPRD,peak.day,-0.0 2030,1,,GASNAT,peak.day,0.0 2030,1,,CO2EMT,peak.day,0.0 -2030,1,,GASPRD,peak.peak,-0.0 -2030,1,,GASNAT,peak.peak,0.0 -2030,1,,CO2EMT,peak.peak,0.0 -2030,1,,GASPRD,peak.evening,-160.07186127462782 -2030,1,,GASNAT,peak.evening,152.44939169012173 -2030,1,,CO2EMT,peak.evening,389.7368698557962 +2030,1,,GASPRD,peak.peak,-10.103793549687925 +2030,1,,GASNAT,peak.peak,9.622660523512309 +2030,1,,CO2EMT,peak.peak,24.60033162835922 +2030,1,,GASPRD,peak.evening,-165.4681888237455 +2030,1,,GASNAT,peak.evening,157.58875126070998 +2030,1,,CO2EMT,peak.evening,402.87564259800513 2030,1,,GASPRD,summer.night,-0.0 2030,1,,GASNAT,summer.night,0.0 2030,1,,CO2EMT,summer.night,0.0 @@ -300,15 +300,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,1,,GASPRD,autumn.peak,-0.0 2030,1,,GASNAT,autumn.peak,0.0 2030,1,,CO2EMT,autumn.peak,0.0 -2030,1,,GASPRD,autumn.evening,-97.71651923768705 -2030,1,,GASNAT,autumn.evening,93.06335165494005 -2030,1,,CO2EMT,autumn.evening,237.91645850585425 -2030,2,,ELCTRI,winter.night,4.176739361506703 -2030,2,,ELCTRI,winter.day,4.032788640688277 -2030,2,,ELCTRI,winter.peak,1.9712501261051125 -2030,2,,ELCTRI,winter.evening,2.2946138373981824 +2030,1,,GASPRD,autumn.evening,-105.72529889958477 +2030,1,,GASNAT,autumn.evening,100.6907608567474 +2030,1,,CO2EMT,autumn.evening,257.4159301302748 +2030,2,,ELCTRI,winter.night,4.435312795545212 +2030,2,,ELCTRI,winter.day,4.968460999877016 +2030,2,,ELCTRI,winter.peak,1.8665272258682173 +2030,2,,ELCTRI,winter.evening,2.5696653598405335 2030,2,,ELCTRI,peak.night,2.851272517283696 -2030,2,,ELCTRI,peak.day,5.874676110889296 +2030,2,,ELCTRI,peak.day,6.3713620320039785 2030,2,,ELCTRI,peak.peak,1.7776452018191917 2030,2,,ELCTRI,peak.evening,1.72484387381507 2030,2,,ELCTRI,summer.night,0.0 @@ -319,54 +319,6 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,2,,ELCTRI,autumn.day,6.001752635595889 2030,2,,ELCTRI,autumn.peak,1.5488393825638174 2030,2,,ELCTRI,autumn.evening,1.9008483513729915 -2030,3,,GASNAT,winter.night,-0.0 -2030,3,,ELCTRI,winter.night,0.0 -2030,3,,CO2EMT,winter.night,0.0 -2030,3,,GASNAT,winter.day,-0.0 -2030,3,,ELCTRI,winter.day,0.0 -2030,3,,CO2EMT,winter.day,0.0 -2030,3,,GASNAT,winter.peak,-0.0 -2030,3,,ELCTRI,winter.peak,0.0 -2030,3,,CO2EMT,winter.peak,0.0 -2030,3,,GASNAT,winter.evening,-0.0 -2030,3,,ELCTRI,winter.evening,0.0 -2030,3,,CO2EMT,winter.evening,0.0 -2030,3,,GASNAT,peak.night,-7.867545817872992 -2030,3,,ELCTRI,peak.night,5.245030545248661 -2030,3,,CO2EMT,peak.night,402.267617667846 -2030,3,,GASNAT,peak.day,-0.0 -2030,3,,ELCTRI,peak.day,0.0 -2030,3,,CO2EMT,peak.day,0.0 -2030,3,,GASNAT,peak.peak,-0.5020743691065259 -2030,3,,ELCTRI,peak.peak,0.33471624607101724 -2030,3,,CO2EMT,peak.peak,25.671062492416667 -2030,3,,GASNAT,peak.evening,-4.170052407650412 -2030,3,,ELCTRI,peak.evening,2.7800349384336083 -2030,3,,CO2EMT,peak.evening,213.21477960316557 -2030,3,,GASNAT,summer.night,-0.0 -2030,3,,ELCTRI,summer.night,0.0 -2030,3,,CO2EMT,summer.night,0.0 -2030,3,,GASNAT,summer.day,-0.0 -2030,3,,ELCTRI,summer.day,0.0 -2030,3,,CO2EMT,summer.day,0.0 -2030,3,,GASNAT,summer.peak,-0.0 -2030,3,,ELCTRI,summer.peak,0.0 -2030,3,,CO2EMT,summer.peak,0.0 -2030,3,,GASNAT,summer.evening,-0.0 -2030,3,,ELCTRI,summer.evening,0.0 -2030,3,,CO2EMT,summer.evening,0.0 -2030,3,,GASNAT,autumn.night,-1.5774907438607992 -2030,3,,ELCTRI,autumn.night,1.0516604959071996 -2030,3,,CO2EMT,autumn.night,80.65710173360266 -2030,3,,GASNAT,autumn.day,-1.2598715880554758 -2030,3,,ELCTRI,autumn.day,0.8399143920369838 -2030,3,,CO2EMT,autumn.day,64.41723429727647 -2030,3,,GASNAT,autumn.peak,-1.7432032445071766 -2030,3,,ELCTRI,autumn.peak,1.1621354963381176 -2030,3,,CO2EMT,autumn.peak,89.12998189165192 -2030,3,,GASNAT,autumn.evening,-3.215337881560794 -2030,3,,ELCTRI,autumn.evening,2.143558587707196 -2030,3,,CO2EMT,autumn.evening,164.40022588420337 2030,7,,ELCTRI,winter.night,-9.624518793997803 2030,7,,RSHEAT,winter.night,29.165208466660005 2030,7,,ELCTRI,winter.day,-13.749312543997803 @@ -375,30 +327,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,7,,RSHEAT,winter.peak,12.499375 2030,7,,ELCTRI,winter.evening,-5.499725043997801 2030,7,,RSHEAT,winter.evening,16.66583346666 -2030,7,,ELCTRI,peak.night,-9.399835688203567 -2030,7,,RSHEAT,peak.night,28.484350570313836 +2030,7,,ELCTRI,peak.night,-5.1072720683930175 +2030,7,,RSHEAT,peak.night,15.476582025433386 2030,7,,ELCTRI,peak.day,-13.749312543997803 2030,7,,RSHEAT,peak.day,41.664583466660005 2030,7,,ELCTRI,peak.peak,-4.12479375 2030,7,,RSHEAT,peak.peak,12.499375 -2030,7,,ELCTRI,peak.evening,-5.499725043997801 -2030,7,,RSHEAT,peak.evening,16.66583346666 -2030,7,,ELCTRI,summer.night,-0.0 -2030,7,,RSHEAT,summer.night,0.0 +2030,7,,ELCTRI,peak.evening,-3.251321687552914 +2030,7,,RSHEAT,peak.evening,9.852489962281558 +2030,7,,ELCTRI,summer.night,-1.9319477961564002 +2030,7,,RSHEAT,summer.night,5.85438726108 2030,7,,ELCTRI,summer.day,-0.0 2030,7,,RSHEAT,summer.day,0.0 2030,7,,ELCTRI,summer.peak,-0.0 2030,7,,RSHEAT,summer.peak,0.0 -2030,7,,ELCTRI,summer.evening,-0.0 -2030,7,,RSHEAT,summer.evening,0.0 -2030,7,,ELCTRI,autumn.night,-6.479418317108167 -2030,7,,RSHEAT,autumn.night,19.634600960933838 +2030,7,,ELCTRI,summer.evening,-0.7892279633502001 +2030,7,,RSHEAT,summer.evening,2.39159988894 +2030,7,,ELCTRI,autumn.night,-6.333673883424229 +2030,7,,RSHEAT,autumn.night,19.192951161891603 2030,7,,ELCTRI,autumn.day,-13.749312543997803 2030,7,,RSHEAT,autumn.day,41.664583466660005 -2030,7,,ELCTRI,autumn.peak,-4.12479375 -2030,7,,RSHEAT,autumn.peak,12.499375 -2030,7,,ELCTRI,autumn.evening,-5.499725043997801 -2030,7,,RSHEAT,autumn.evening,16.66583346666 +2030,7,,ELCTRI,autumn.peak,-3.327632561166567 +2030,7,,RSHEAT,autumn.peak,10.083735033838082 +2030,7,,ELCTRI,autumn.evening,-3.8645226062475744 +2030,7,,RSHEAT,autumn.evening,11.710674564386588 2030,8,,ELCTRI,winter.night,-6.156111669545036 2030,8,,RSHEAT,winter.night,18.65488384710617 2030,8,,ELCTRI,winter.day,-8.794445230146241 @@ -415,14 +367,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,RSHEAT,peak.peak,7.9949501836400145 2030,8,,ELCTRI,peak.evening,-3.5177781089438307 2030,8,,RSHEAT,peak.evening,10.659933663466154 -2030,8,,ELCTRI,summer.night,-1.9319477961564002 -2030,8,,RSHEAT,summer.night,5.85438726108 +2030,8,,ELCTRI,summer.night,-0.0 +2030,8,,RSHEAT,summer.night,0.0 2030,8,,ELCTRI,summer.day,-3.2188600626534005 2030,8,,RSHEAT,summer.day,9.75412140198 2030,8,,ELCTRI,summer.peak,-1.0599640039494003 2030,8,,RSHEAT,summer.peak,3.2120121331800005 -2030,8,,ELCTRI,summer.evening,-0.7892279633502001 -2030,8,,RSHEAT,summer.evening,2.39159988894 +2030,8,,ELCTRI,summer.evening,-0.0 +2030,8,,RSHEAT,summer.evening,0.0 2030,8,,ELCTRI,autumn.night,-6.156111669545036 2030,8,,RSHEAT,autumn.night,18.65488384710617 2030,8,,ELCTRI,autumn.day,-8.794445230146241 @@ -431,22 +383,70 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,RSHEAT,autumn.peak,7.9949501836400145 2030,8,,ELCTRI,autumn.evening,-3.5177781089438307 2030,8,,RSHEAT,autumn.evening,10.659933663466154 -2030,9,,ELCTRI,winter.night,11.603891102036135 -2030,9,,ELCTRI,winter.day,18.510969133455767 -2030,9,,ELCTRI,winter.peak,4.791877184496093 -2030,9,,ELCTRI,winter.evening,6.722889315543449 -2030,9,,ELCTRI,peak.night,7.459644295216245 -2030,9,,ELCTRI,peak.day,16.669081663254747 -2030,9,,ELCTRI,peak.peak,4.650765862710997 -2030,9,,ELCTRI,peak.evening,4.512624340692953 +2030,9,,ELCTRI,winter.night,11.017350219982143 +2030,9,,ELCTRI,winter.day,17.575296774267027 +2030,9,,ELCTRI,winter.peak,4.896600084732988 +2030,9,,ELCTRI,winter.evening,6.38306800953358 +2030,9,,ELCTRI,peak.night,7.082582298834926 +2030,9,,ELCTRI,peak.day,15.826511031057079 +2030,9,,ELCTRI,peak.peak,4.415684002035619 +2030,9,,ELCTRI,peak.evening,4.284525107608637 2030,9,,ELCTRI,summer.night,1.9319477961564002 2030,9,,ELCTRI,summer.day,3.2188600626534005 2030,9,,ELCTRI,summer.peak,1.0599640039494003 2030,9,,ELCTRI,summer.evening,0.7892279633502001 -2030,9,,ELCTRI,autumn.night,8.380588024763819 -2030,9,,ELCTRI,autumn.day,15.70209074651117 -2030,9,,ELCTRI,autumn.peak,4.0521524316992705 -2030,9,,ELCTRI,autumn.evening,4.973096213861444 +2030,9,,ELCTRI,autumn.night,7.956975165167648 +2030,9,,ELCTRI,autumn.day,14.908398520725422 +2030,9,,ELCTRI,autumn.peak,3.8473286324575606 +2030,9,,ELCTRI,autumn.evening,4.721721548745376 +2030,10,,GASNAT,winter.night,-0.49195117202322525 +2030,10,,ELCTRI,winter.night,0.3279674480154835 +2030,10,,CO2EMT,winter.night,25.153463425547503 +2030,10,,GASNAT,winter.day,-0.0 +2030,10,,ELCTRI,winter.day,0.0 +2030,10,,CO2EMT,winter.day,0.0 +2030,10,,GASNAT,winter.peak,-0.0 +2030,10,,ELCTRI,winter.peak,0.0 +2030,10,,CO2EMT,winter.peak,0.0 +2030,10,,GASNAT,winter.evening,-0.09715467535127642 +2030,10,,ELCTRI,winter.evening,0.06476978356751761 +2030,10,,CO2EMT,winter.evening,4.967518550710763 +2030,10,,GASNAT,peak.night,-1.9942933827291482 +2030,10,,ELCTRI,peak.night,1.3295289218194322 +2030,10,,CO2EMT,peak.night,101.96822065894133 +2030,10,,GASNAT,peak.day,-0.5188270666244792 +2030,10,,ELCTRI,peak.day,0.34588471108298613 +2030,10,,CO2EMT,peak.day,26.52762791650962 +2030,10,,GASNAT,peak.peak,-0.8546971601195916 +2030,10,,ELCTRI,peak.peak,0.5697981067463944 +2030,10,,CO2EMT,peak.peak,43.70066579691471 +2030,10,,GASNAT,peak.evening,-1.1395962226095573 +2030,10,,ELCTRI,peak.evening,0.7597308150730382 +2030,10,,CO2EMT,peak.evening,58.26755486202666 +2030,10,,GASNAT,summer.night,-0.0 +2030,10,,ELCTRI,summer.night,0.0 +2030,10,,CO2EMT,summer.night,0.0 +2030,10,,GASNAT,summer.day,-0.0 +2030,10,,ELCTRI,summer.day,0.0 +2030,10,,CO2EMT,summer.day,0.0 +2030,10,,GASNAT,summer.peak,-0.0 +2030,10,,ELCTRI,summer.peak,0.0 +2030,10,,CO2EMT,summer.peak,0.0 +2030,10,,GASNAT,summer.evening,-0.0 +2030,10,,ELCTRI,summer.evening,0.0 +2030,10,,CO2EMT,summer.evening,0.0 +2030,10,,GASNAT,autumn.night,-1.9942933827291482 +2030,10,,ELCTRI,autumn.night,1.3295289218194322 +2030,10,,CO2EMT,autumn.night,101.96822065894133 +2030,10,,GASNAT,autumn.day,-2.4504099267341006 +2030,10,,ELCTRI,autumn.day,1.6336066178227338 +2030,10,,CO2EMT,autumn.day,125.28945955391455 +2030,10,,GASNAT,autumn.peak,-0.8546971601195907 +2030,10,,ELCTRI,autumn.peak,0.5697981067463939 +2030,10,,CO2EMT,autumn.peak,43.70066579691467 +2030,10,,GASNAT,autumn.evening,-1.1395962226095573 +2030,10,,ELCTRI,autumn.evening,0.7597308150730382 +2030,10,,CO2EMT,autumn.evening,58.26755486202666 2030,,0,GASNAT,winter.night,-22.392032154537905 2030,,0,RSHEAT,winter.night,19.47133230829383 2030,,0,CO2EMT,winter.night,1144.9046040615233 @@ -459,18 +459,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,,0,GASNAT,winter.evening,-59.18171190669392 2030,,0,RSHEAT,winter.evening,51.46235817973385 2030,,0,CO2EMT,winter.evening,3025.9609297892603 -2030,,0,GASNAT,peak.night,-0.0 -2030,,0,RSHEAT,peak.night,0.0 -2030,,0,CO2EMT,peak.night,0.0 +2030,,0,GASNAT,peak.night,-14.958933826612517 +2030,,0,RSHEAT,peak.night,13.00776854488045 +2030,,0,CO2EMT,peak.night,764.8502865546981 2030,,0,GASNAT,peak.day,-65.56548235539388 2030,,0,RSHEAT,peak.day,57.01346291773381 2030,,0,CO2EMT,peak.day,3352.3631128312895 2030,,0,GASNAT,peak.peak,-56.93266027512 2030,,0,RSHEAT,peak.peak,49.5066611088 2030,,0,CO2EMT,peak.peak,2910.9669198668857 -2030,,0,GASNAT,peak.evening,-17.41157646497793 -2030,,0,RSHEAT,peak.evening,15.140501273893852 -2030,,0,CO2EMT,peak.evening,890.2539046543216 +2030,,0,GASNAT,peak.evening,-25.246921495013133 +2030,,0,RSHEAT,peak.evening,21.95384477827229 +2030,,0,CO2EMT,peak.evening,1290.8750960400216 2030,,0,GASNAT,summer.night,-0.0 2030,,0,RSHEAT,summer.night,0.0 2030,,0,CO2EMT,summer.night,0.0 @@ -483,24 +483,24 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,,0,GASNAT,summer.evening,-0.0 2030,,0,RSHEAT,summer.evening,0.0 2030,,0,CO2EMT,summer.evening,0.0 -2030,,0,GASNAT,autumn.night,-0.0 -2030,,0,RSHEAT,autumn.night,0.0 -2030,,0,CO2EMT,autumn.night,0.0 +2030,,0,GASNAT,autumn.night,-0.5078972688985702 +2030,,0,RSHEAT,autumn.night,0.441649799042235 +2030,,0,CO2EMT,autumn.night,25.9687873587839 2030,,0,GASNAT,autumn.day,-37.326917524677896 2030,,0,RSHEAT,autumn.day,32.458189151893826 2030,,0,CO2EMT,autumn.day,1908.525293036781 -2030,,0,GASNAT,autumn.peak,-40.82323980491698 -2030,,0,RSHEAT,autumn.peak,35.49846939557999 -2030,,0,CO2EMT,autumn.peak,2087.2922512254054 -2030,,0,GASNAT,autumn.evening,-7.117290867360923 -2030,,0,RSHEAT,autumn.evening,6.188948580313847 -2030,,0,CO2EMT,autumn.evening,363.90708204816406 +2030,,0,GASNAT,autumn.peak,-43.60122576600319 +2030,,0,RSHEAT,autumn.peak,37.91410936174191 +2030,,0,CO2EMT,autumn.peak,2229.330673415743 +2030,,0,GASNAT,autumn.evening,-12.815723604975345 +2030,,0,RSHEAT,autumn.evening,11.144107482587257 +2030,,0,CO2EMT,autumn.evening,655.2679479223895 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,0.0 -2040,0,,CO2EMT,winter.day,0.0 -2040,0,,GASPRD,winter.peak,72.79220320127652 -2040,0,,CO2EMT,winter.peak,372.18653496812686 +2040,0,,GASPRD,winter.day,36.46901618807664 +2040,0,,CO2EMT,winter.day,186.46607976963585 +2040,0,,GASPRD,winter.peak,125.070625 +2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 2040,0,,CO2EMT,winter.evening,852.6481476545185 2040,0,,GASPRD,peak.night,0.0 @@ -509,8 +509,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,peak.day,0.0 2040,0,,GASPRD,peak.peak,0.0 2040,0,,CO2EMT,peak.peak,0.0 -2040,0,,GASPRD,peak.evening,0.1684466499284883 -2040,0,,CO2EMT,peak.evening,0.8612677210843607 +2040,0,,GASPRD,peak.evening,98.44708935531058 +2040,0,,CO2EMT,peak.evening,503.35996787370306 2040,0,,GASPRD,summer.night,0.0 2040,0,,CO2EMT,summer.night,0.0 2040,0,,GASPRD,summer.day,0.0 @@ -525,14 +525,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.day,0.0 2040,0,,GASPRD,autumn.peak,0.0 2040,0,,CO2EMT,autumn.peak,0.0 -2040,0,,GASPRD,autumn.evening,0.0 -2040,0,,CO2EMT,autumn.evening,0.0 +2040,0,,GASPRD,autumn.evening,42.808498946851394 +2040,0,,CO2EMT,autumn.evening,218.8798551152512 2040,1,,GASPRD,winter.night,-0.0 2040,1,,GASNAT,winter.night,0.0 2040,1,,CO2EMT,winter.night,0.0 -2040,1,,GASPRD,winter.day,-38.55820051936519 -2040,1,,GASNAT,winter.day,36.72209573272875 -2040,1,,CO2EMT,winter.day,93.88003774072105 +2040,1,,GASPRD,winter.day,-38.731146406751115 +2040,1,,GASNAT,winter.day,36.88680610166773 +2040,1,,CO2EMT,winter.day,94.30111979891356 2040,1,,GASPRD,winter.peak,-124.10114062500001 2040,1,,GASNAT,winter.peak,118.1915625 2040,1,,CO2EMT,winter.peak,302.15672953125005 @@ -548,9 +548,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,peak.peak,-0.0 2040,1,,GASNAT,peak.peak,0.0 2040,1,,CO2EMT,peak.peak,0.0 -2040,1,,GASPRD,peak.evening,-0.16844664992848898 -2040,1,,GASNAT,peak.evening,0.16042538088427521 -2040,1,,CO2EMT,peak.evening,0.4101274862306496 +2040,1,,GASPRD,peak.evening,-98.44708935531058 +2040,1,,GASNAT,peak.evening,93.75913271934341 +2040,1,,CO2EMT,peak.evening,239.69522279700146 2040,1,,GASPRD,summer.night,-0.0 2040,1,,GASNAT,summer.night,0.0 2040,1,,CO2EMT,summer.night,0.0 @@ -572,15 +572,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.peak,-0.0 2040,1,,GASNAT,autumn.peak,0.0 2040,1,,CO2EMT,autumn.peak,0.0 -2040,1,,GASPRD,autumn.evening,-38.65549065096244 -2040,1,,GASNAT,autumn.evening,36.81475300091661 -2040,1,,CO2EMT,autumn.evening,94.11691604684333 -2040,2,,ELCTRI,winter.night,2.4475410021799284 -2040,2,,ELCTRI,winter.day,2.891986489309728 -2040,2,,ELCTRI,winter.peak,1.615661677508089 -2040,2,,ELCTRI,winter.evening,2.4441635698407014 +2040,1,,GASPRD,autumn.evening,-42.808498946851394 +2040,1,,GASNAT,autumn.evening,40.76999899700132 +2040,1,,CO2EMT,autumn.evening,104.22850243583389 +2040,2,,ELCTRI,winter.night,2.8536902681388874 +2040,2,,ELCTRI,winter.day,3.539891270527713 +2040,2,,ELCTRI,winter.peak,1.7961724618981405 +2040,2,,ELCTRI,winter.evening,2.5696653598405335 2040,2,,ELCTRI,peak.night,2.851272517283696 -2040,2,,ELCTRI,peak.day,6.371362032003983 +2040,2,,ELCTRI,peak.day,6.3713620320039785 2040,2,,ELCTRI,peak.peak,1.7776452018191917 2040,2,,ELCTRI,peak.evening,1.72484387381507 2040,2,,ELCTRI,summer.night,0.0 @@ -591,54 +591,6 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,2,,ELCTRI,autumn.day,6.001752635595889 2040,2,,ELCTRI,autumn.peak,1.5488393825638174 2040,2,,ELCTRI,autumn.evening,1.9008483513729915 -2040,3,,GASNAT,winter.night,-0.0 -2040,3,,ELCTRI,winter.night,0.0 -2040,3,,CO2EMT,winter.night,0.0 -2040,3,,GASNAT,winter.day,-0.0 -2040,3,,ELCTRI,winter.day,0.0 -2040,3,,CO2EMT,winter.day,0.0 -2040,3,,GASNAT,winter.peak,-0.0 -2040,3,,ELCTRI,winter.peak,0.0 -2040,3,,CO2EMT,winter.peak,0.0 -2040,3,,GASNAT,winter.evening,-0.0 -2040,3,,ELCTRI,winter.evening,0.0 -2040,3,,CO2EMT,winter.evening,0.0 -2040,3,,GASNAT,peak.night,-0.0 -2040,3,,ELCTRI,peak.night,0.0 -2040,3,,CO2EMT,peak.night,0.0 -2040,3,,GASNAT,peak.day,-0.0 -2040,3,,ELCTRI,peak.day,0.0 -2040,3,,CO2EMT,peak.day,0.0 -2040,3,,GASNAT,peak.peak,-1.1922671347868925 -2040,3,,ELCTRI,peak.peak,0.794844756524595 -2040,3,,CO2EMT,peak.peak,60.960618601653806 -2040,3,,GASNAT,peak.evening,-4.720047486969795 -2040,3,,ELCTRI,peak.evening,3.14669832464653 -2040,3,,CO2EMT,peak.evening,241.3360280087656 -2040,3,,GASNAT,summer.night,-0.0 -2040,3,,ELCTRI,summer.night,0.0 -2040,3,,CO2EMT,summer.night,0.0 -2040,3,,GASNAT,summer.day,-0.0 -2040,3,,ELCTRI,summer.day,0.0 -2040,3,,CO2EMT,summer.day,0.0 -2040,3,,GASNAT,summer.peak,-0.0 -2040,3,,ELCTRI,summer.peak,0.0 -2040,3,,CO2EMT,summer.peak,0.0 -2040,3,,GASNAT,summer.evening,-0.0 -2040,3,,ELCTRI,summer.evening,0.0 -2040,3,,CO2EMT,summer.evening,0.0 -2040,3,,GASNAT,autumn.night,-0.0 -2040,3,,ELCTRI,autumn.night,0.0 -2040,3,,CO2EMT,autumn.night,0.0 -2040,3,,GASNAT,autumn.day,-1.2426021646592815 -2040,3,,ELCTRI,autumn.day,0.8284014431061877 -2040,3,,CO2EMT,autumn.day,63.53424867902906 -2040,3,,GASNAT,autumn.peak,-1.2653154175362775 -2040,3,,ELCTRI,autumn.peak,0.8435436116908517 -2040,3,,CO2EMT,autumn.peak,64.69557729862986 -2040,3,,GASNAT,autumn.evening,-1.2618068071177608 -2040,3,,ELCTRI,autumn.evening,0.8412045380785073 -2040,3,,CO2EMT,autumn.evening,64.51618204793111 2040,8,,ELCTRI,winter.night,-4.021921067499379 2040,8,,RSHEAT,winter.night,12.187639598482967 2040,8,,ELCTRI,winter.day,-8.794445230146241 @@ -653,8 +605,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,8,,RSHEAT,peak.day,26.649834030746185 2040,8,,ELCTRI,peak.peak,-2.638333560601205 2040,8,,RSHEAT,peak.peak,7.9949501836400145 -2040,8,,ELCTRI,peak.evening,-3.5177781089438307 -2040,8,,RSHEAT,peak.evening,10.659933663466154 +2040,8,,ELCTRI,peak.evening,-0.0 +2040,8,,RSHEAT,peak.evening,0.0 2040,8,,ELCTRI,summer.night,-0.0 2040,8,,RSHEAT,summer.night,0.0 2040,8,,ELCTRI,summer.day,-0.0 @@ -667,186 +619,186 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,8,,RSHEAT,autumn.night,0.0 2040,8,,ELCTRI,autumn.day,-7.426565126586479 2040,8,,RSHEAT,autumn.day,22.504742807837815 -2040,8,,ELCTRI,autumn.peak,-2.638333560601205 -2040,8,,RSHEAT,autumn.peak,7.9949501836400145 +2040,8,,ELCTRI,autumn.peak,-1.2996828286446767 +2040,8,,RSHEAT,autumn.peak,3.9384328140747775 2040,8,,ELCTRI,autumn.evening,-0.5102606535668829 2040,8,,RSHEAT,autumn.evening,1.5462444047481299 -2040,9,,ELCTRI,winter.night,11.603891102036135 -2040,9,,ELCTRI,winter.day,18.510969133455767 -2040,9,,ELCTRI,winter.peak,5.157284920507374 -2040,9,,ELCTRI,winter.evening,6.722889315543449 -2040,9,,ELCTRI,peak.night,7.459644295216245 -2040,9,,ELCTRI,peak.day,16.669081663254747 -2040,9,,ELCTRI,peak.peak,4.650765862710997 -2040,9,,ELCTRI,peak.evening,4.512624340692953 +2040,9,,ELCTRI,winter.night,11.017350219982143 +2040,9,,ELCTRI,winter.day,17.575296774267027 +2040,9,,ELCTRI,winter.peak,4.896600084732988 +2040,9,,ELCTRI,winter.evening,6.38306800953358 +2040,9,,ELCTRI,peak.night,7.082582298834926 +2040,9,,ELCTRI,peak.day,15.826511031057079 +2040,9,,ELCTRI,peak.peak,4.415684002035619 +2040,9,,ELCTRI,peak.evening,4.284525107608637 2040,9,,ELCTRI,summer.night,0.0 2040,9,,ELCTRI,summer.day,0.0 2040,9,,ELCTRI,summer.peak,0.0 2040,9,,ELCTRI,summer.evening,0.0 -2040,9,,ELCTRI,autumn.night,6.414838139382596 -2040,9,,ELCTRI,autumn.day,15.70209074651117 -2040,9,,ELCTRI,autumn.peak,4.0521524316992705 -2040,9,,ELCTRI,autumn.evening,4.973096213861444 -2040,10,,ELCTRI,winter.night,-20.345685928780423 -2040,10,,RSHEAT,winter.night,61.65359372357704 -2040,10,,ELCTRI,winter.day,-29.065265572682524 -2040,10,,RSHEAT,winter.day,88.07656234146219 -2040,10,,ELCTRI,winter.peak,-8.719579643902103 -2040,10,,RSHEAT,winter.peak,26.422968617885157 -2040,10,,ELCTRI,winter.evening,-11.626106284878318 -2040,10,,RSHEAT,winter.evening,35.23062510569187 -2040,10,,ELCTRI,peak.night,-17.070085004748602 -2040,10,,RSHEAT,peak.night,51.727530317420005 -2040,10,,ELCTRI,peak.day,-29.065265572682524 -2040,10,,RSHEAT,peak.day,88.07656234146219 -2040,10,,ELCTRI,peak.peak,-8.719579643902103 -2040,10,,RSHEAT,peak.peak,26.422968617885157 -2040,10,,ELCTRI,peak.evening,-11.626106284878318 -2040,10,,RSHEAT,peak.evening,35.23062510569187 -2040,10,,ELCTRI,summer.night,-2.1199938741564 -2040,10,,RSHEAT,summer.night,6.424223861080001 -2040,10,,ELCTRI,summer.day,-3.5321677056534004 -2040,10,,RSHEAT,summer.day,10.70353850198 -2040,10,,ELCTRI,summer.peak,-1.1631355669494001 -2040,10,,RSHEAT,summer.peak,3.5246532331800005 -2040,10,,ELCTRI,summer.evening,-0.8660474423502 -2040,10,,RSHEAT,summer.evening,2.62438618894 -2040,10,,ELCTRI,autumn.night,-13.865408900653202 -2040,10,,RSHEAT,autumn.night,42.016390608040005 -2040,10,,ELCTRI,autumn.day,-29.065265572682524 -2040,10,,RSHEAT,autumn.day,88.07656234146219 -2040,10,,ELCTRI,autumn.peak,-8.719579643902103 -2040,10,,RSHEAT,autumn.peak,26.422968617885157 -2040,10,,ELCTRI,autumn.evening,-11.626106284878318 -2040,10,,RSHEAT,autumn.evening,35.23062510569187 -2040,14,,ELCTRI,winter.night,10.31617489206374 -2040,14,,ELCTRI,winter.day,16.456755180063272 -2040,14,,ELCTRI,winter.peak,4.5849666064878445 -2040,14,,ELCTRI,winter.evening,5.976831508437999 -2040,14,,ELCTRI,peak.night,6.631826729960698 -2040,14,,ELCTRI,peak.day,14.819267107570036 -2040,14,,ELCTRI,peak.peak,4.134657383448524 -2040,14,,ELCTRI,peak.evening,4.011845812014185 -2040,14,,ELCTRI,summer.night,2.1199938741564 -2040,14,,ELCTRI,summer.day,3.5321677056534004 -2040,14,,ELCTRI,summer.peak,1.1631355669494001 -2040,14,,ELCTRI,summer.evening,0.8660474423502 -2040,14,,ELCTRI,autumn.night,7.4505707612706065 -2040,14,,ELCTRI,autumn.day,13.959585874055756 -2040,14,,ELCTRI,autumn.peak,3.6024737570465417 -2040,14,,ELCTRI,autumn.evening,4.421217835132259 -2040,15,,GASNAT,winter.night,-0.0 -2040,15,,ELCTRI,winter.night,0.0 -2040,15,,CO2EMT,winter.night,0.0 -2040,15,,GASNAT,winter.day,-0.0 -2040,15,,ELCTRI,winter.day,0.0 -2040,15,,CO2EMT,winter.day,0.0 -2040,15,,GASNAT,winter.peak,-0.0 -2040,15,,ELCTRI,winter.peak,0.0 -2040,15,,CO2EMT,winter.peak,0.0 -2040,15,,GASNAT,winter.evening,-0.0 -2040,15,,ELCTRI,winter.evening,0.0 -2040,15,,CO2EMT,winter.evening,0.0 -2040,15,,GASNAT,peak.night,-0.1910121934319431 -2040,15,,ELCTRI,peak.night,0.12734146228796206 -2040,15,,CO2EMT,peak.night,9.766453450175248 -2040,15,,GASNAT,peak.day,-0.0 -2040,15,,ELCTRI,peak.day,0.0 -2040,15,,CO2EMT,peak.day,0.0 -2040,15,,GASNAT,peak.peak,-0.0 -2040,15,,ELCTRI,peak.peak,0.0 -2040,15,,CO2EMT,peak.peak,0.0 -2040,15,,GASNAT,peak.evening,-2.621808063980117 -2040,15,,ELCTRI,peak.evening,1.7478720426534113 -2040,15,,CO2EMT,peak.evening,134.05304631130338 -2040,15,,GASNAT,summer.night,-0.0 -2040,15,,ELCTRI,summer.night,0.0 -2040,15,,CO2EMT,summer.night,0.0 -2040,15,,GASNAT,summer.day,-0.0 -2040,15,,ELCTRI,summer.day,0.0 -2040,15,,CO2EMT,summer.day,0.0 -2040,15,,GASNAT,summer.peak,-0.0 -2040,15,,ELCTRI,summer.peak,0.0 -2040,15,,CO2EMT,summer.peak,0.0 -2040,15,,GASNAT,summer.evening,-0.0 -2040,15,,ELCTRI,summer.evening,0.0 -2040,15,,CO2EMT,summer.evening,0.0 -2040,15,,GASNAT,autumn.night,-0.0 -2040,15,,ELCTRI,autumn.night,0.0 -2040,15,,CO2EMT,autumn.night,0.0 -2040,15,,GASNAT,autumn.day,-0.0 -2040,15,,ELCTRI,autumn.day,0.0 -2040,15,,CO2EMT,autumn.day,0.0 -2040,15,,GASNAT,autumn.peak,-1.9663560322542397 -2040,15,,ELCTRI,autumn.peak,1.3109040215028265 -2040,15,,CO2EMT,autumn.peak,100.53978392915927 -2040,15,,GASNAT,autumn.evening,-0.0 -2040,15,,ELCTRI,autumn.evening,0.0 -2040,15,,CO2EMT,autumn.evening,0.0 -2040,16,,GASPRD,winter.night,-0.0 -2040,16,,GASNAT,winter.night,0.0 +2040,9,,ELCTRI,autumn.night,6.284555305433168 +2040,9,,ELCTRI,autumn.day,14.908398520725422 +2040,9,,ELCTRI,autumn.peak,3.8473286324575606 +2040,9,,ELCTRI,autumn.evening,4.721721548745376 +2040,10,,GASNAT,winter.night,-0.0 +2040,10,,ELCTRI,winter.night,0.0 +2040,10,,CO2EMT,winter.night,0.0 +2040,10,,GASNAT,winter.day,-0.0 +2040,10,,ELCTRI,winter.day,0.0 +2040,10,,CO2EMT,winter.day,0.0 +2040,10,,GASNAT,winter.peak,-0.0 +2040,10,,ELCTRI,winter.peak,0.0 +2040,10,,CO2EMT,winter.peak,0.0 +2040,10,,GASNAT,winter.evening,-0.1647103689389655 +2040,10,,ELCTRI,winter.evening,0.109806912625977 +2040,10,,CO2EMT,winter.evening,8.421641163849305 +2040,10,,GASNAT,peak.night,-0.0 +2040,10,,ELCTRI,peak.night,0.0 +2040,10,,CO2EMT,peak.night,0.0 +2040,10,,GASNAT,peak.day,-0.8751549659777034 +2040,10,,ELCTRI,peak.day,0.5834366439851356 +2040,10,,CO2EMT,peak.day,44.746673410439975 +2040,10,,GASNAT,peak.peak,-0.8546971601195907 +2040,10,,ELCTRI,peak.peak,0.5697981067463939 +2040,10,,CO2EMT,peak.peak,43.70066579691467 +2040,10,,GASNAT,peak.evening,-1.1395962226095573 +2040,10,,ELCTRI,peak.evening,0.7597308150730382 +2040,10,,CO2EMT,peak.evening,58.26755486202666 +2040,10,,GASNAT,summer.night,-0.0 +2040,10,,ELCTRI,summer.night,0.0 +2040,10,,CO2EMT,summer.night,0.0 +2040,10,,GASNAT,summer.day,-0.0 +2040,10,,ELCTRI,summer.day,0.0 +2040,10,,CO2EMT,summer.day,0.0 +2040,10,,GASNAT,summer.peak,-0.0 +2040,10,,ELCTRI,summer.peak,0.0 +2040,10,,CO2EMT,summer.peak,0.0 +2040,10,,GASNAT,summer.evening,-0.0 +2040,10,,ELCTRI,summer.evening,0.0 +2040,10,,CO2EMT,summer.evening,0.0 +2040,10,,GASNAT,autumn.night,-0.0 +2040,10,,ELCTRI,autumn.night,0.0 +2040,10,,CO2EMT,autumn.night,0.0 +2040,10,,GASNAT,autumn.day,-2.066988472834492 +2040,10,,ELCTRI,autumn.day,1.3779923152229947 +2040,10,,CO2EMT,autumn.day,105.68512061602758 +2040,10,,GASNAT,autumn.peak,-0.8546971601195907 +2040,10,,ELCTRI,autumn.peak,0.5697981067463939 +2040,10,,CO2EMT,autumn.peak,43.70066579691467 +2040,10,,GASNAT,autumn.evening,-1.1395962226095573 +2040,10,,ELCTRI,autumn.evening,0.7597308150730382 +2040,10,,CO2EMT,autumn.evening,58.26755486202666 +2040,11,,ELCTRI,winter.night,-20.345685928780423 +2040,11,,RSHEAT,winter.night,61.65359372357704 +2040,11,,ELCTRI,winter.day,-29.065265572682524 +2040,11,,RSHEAT,winter.day,88.07656234146219 +2040,11,,ELCTRI,winter.peak,-8.719579643902103 +2040,11,,RSHEAT,winter.peak,26.422968617885157 +2040,11,,ELCTRI,winter.evening,-11.626106284878318 +2040,11,,RSHEAT,winter.evening,35.23062510569187 +2040,11,,ELCTRI,peak.night,-17.070085004748602 +2040,11,,RSHEAT,peak.night,51.727530317420005 +2040,11,,ELCTRI,peak.day,-29.065265572682524 +2040,11,,RSHEAT,peak.day,88.07656234146219 +2040,11,,ELCTRI,peak.peak,-8.719579643902103 +2040,11,,RSHEAT,peak.peak,26.422968617885157 +2040,11,,ELCTRI,peak.evening,-11.368202836566402 +2040,11,,RSHEAT,peak.evening,34.44909950474667 +2040,11,,ELCTRI,summer.night,-2.1199938741564 +2040,11,,RSHEAT,summer.night,6.424223861080001 +2040,11,,ELCTRI,summer.day,-3.5321677056534004 +2040,11,,RSHEAT,summer.day,10.70353850198 +2040,11,,ELCTRI,summer.peak,-1.1631355669494001 +2040,11,,RSHEAT,summer.peak,3.5246532331800005 +2040,11,,ELCTRI,summer.evening,-0.8660474423502 +2040,11,,RSHEAT,summer.evening,2.62438618894 +2040,11,,ELCTRI,autumn.night,-13.865408900653202 +2040,11,,RSHEAT,autumn.night,42.016390608040005 +2040,11,,ELCTRI,autumn.day,-29.065265572682524 +2040,11,,RSHEAT,autumn.day,88.07656234146219 +2040,11,,ELCTRI,autumn.peak,-8.719579643902103 +2040,11,,RSHEAT,autumn.peak,26.422968617885157 +2040,11,,ELCTRI,autumn.evening,-11.626106284878318 +2040,11,,RSHEAT,autumn.evening,35.23062510569187 +2040,15,,ELCTRI,winter.night,10.496566508158773 +2040,15,,ELCTRI,winter.day,16.744522758034027 +2040,15,,ELCTRI,winter.peak,4.665140657872179 +2040,15,,ELCTRI,winter.evening,6.081344111822058 +2040,15,,ELCTRI,peak.night,6.747792769117342 +2040,15,,ELCTRI,peak.day,15.078401095782572 +2040,15,,ELCTRI,peak.peak,4.206957197595077 +2040,15,,ELCTRI,peak.evening,4.081998107523451 +2040,15,,ELCTRI,summer.night,2.1199938741564 +2040,15,,ELCTRI,summer.day,3.5321677056534004 +2040,15,,ELCTRI,summer.peak,1.1631355669494001 +2040,15,,ELCTRI,summer.evening,0.8660474423502 +2040,15,,ELCTRI,autumn.night,7.580853595220034 +2040,15,,ELCTRI,autumn.day,14.203687227724698 +2040,15,,ELCTRI,autumn.peak,3.6654676544719824 +2040,15,,ELCTRI,autumn.evening,4.4985285281684195 +2040,16,,GASNAT,winter.night,-0.0 +2040,16,,ELCTRI,winter.night,0.0 2040,16,,CO2EMT,winter.night,0.0 -2040,16,,GASPRD,winter.day,-0.0 -2040,16,,GASNAT,winter.day,0.0 +2040,16,,GASNAT,winter.day,-0.0 +2040,16,,ELCTRI,winter.day,0.0 2040,16,,CO2EMT,winter.day,0.0 -2040,16,,GASPRD,winter.peak,-0.0 -2040,16,,GASNAT,winter.peak,0.0 +2040,16,,GASNAT,winter.peak,-0.0 +2040,16,,ELCTRI,winter.peak,0.0 2040,16,,CO2EMT,winter.peak,0.0 -2040,16,,GASPRD,winter.evening,-0.0 -2040,16,,GASNAT,winter.evening,0.0 +2040,16,,GASNAT,winter.evening,-0.0 +2040,16,,ELCTRI,winter.evening,0.0 2040,16,,CO2EMT,winter.evening,0.0 -2040,16,,GASPRD,peak.night,-25.834226877091545 -2040,16,,GASNAT,peak.night,24.60402559723004 -2040,16,,CO2EMT,peak.night,62.900191439318604 -2040,16,,GASPRD,peak.day,-36.90603834523107 -2040,16,,GASNAT,peak.day,35.14860794783911 -2040,16,,CO2EMT,peak.day,89.8574162186507 -2040,16,,GASPRD,peak.peak,-11.071811468139522 -2040,16,,GASNAT,peak.peak,10.544582350609069 -2040,16,,CO2EMT,peak.peak,26.957224779332087 -2040,16,,GASPRD,peak.evening,-14.762415408952018 -2040,16,,GASNAT,peak.evening,14.059443246620969 -2040,16,,CO2EMT,peak.evening,35.94296665998651 -2040,16,,GASPRD,summer.night,-0.0 -2040,16,,GASNAT,summer.night,0.0 +2040,16,,GASNAT,peak.night,-0.5826561292689578 +2040,16,,ELCTRI,peak.night,0.38843741951263855 +2040,16,,CO2EMT,peak.night,29.79120788952181 +2040,16,,GASNAT,peak.day,-0.0 +2040,16,,ELCTRI,peak.day,0.0 +2040,16,,CO2EMT,peak.day,0.0 +2040,16,,GASNAT,peak.peak,-0.5817430444605378 +2040,16,,ELCTRI,peak.peak,0.3878286963070252 +2040,16,,CO2EMT,peak.peak,29.744521863267295 +2040,16,,GASNAT,peak.evening,-0.775657398819309 +2040,16,,ELCTRI,peak.evening,0.5171049325462059 +2040,16,,CO2EMT,peak.evening,39.65936280163126 +2040,16,,GASNAT,summer.night,-0.0 +2040,16,,ELCTRI,summer.night,0.0 2040,16,,CO2EMT,summer.night,0.0 -2040,16,,GASPRD,summer.day,-0.0 -2040,16,,GASNAT,summer.day,0.0 +2040,16,,GASNAT,summer.day,-0.0 +2040,16,,ELCTRI,summer.day,0.0 2040,16,,CO2EMT,summer.day,0.0 -2040,16,,GASPRD,summer.peak,-0.0 -2040,16,,GASNAT,summer.peak,0.0 +2040,16,,GASNAT,summer.peak,-0.0 +2040,16,,ELCTRI,summer.peak,0.0 2040,16,,CO2EMT,summer.peak,0.0 -2040,16,,GASPRD,summer.evening,-0.0 -2040,16,,GASNAT,summer.evening,0.0 +2040,16,,GASNAT,summer.evening,-0.0 +2040,16,,ELCTRI,summer.evening,0.0 2040,16,,CO2EMT,summer.evening,0.0 -2040,16,,GASPRD,autumn.night,-0.0 -2040,16,,GASNAT,autumn.night,0.0 +2040,16,,GASNAT,autumn.night,-0.0 +2040,16,,ELCTRI,autumn.night,0.0 2040,16,,CO2EMT,autumn.night,0.0 -2040,16,,GASPRD,autumn.day,-0.0 -2040,16,,GASNAT,autumn.day,0.0 +2040,16,,GASNAT,autumn.day,-0.0 +2040,16,,ELCTRI,autumn.day,0.0 2040,16,,CO2EMT,autumn.day,0.0 -2040,16,,GASPRD,autumn.peak,-0.0 -2040,16,,GASNAT,autumn.peak,0.0 -2040,16,,CO2EMT,autumn.peak,0.0 -2040,16,,GASPRD,autumn.evening,-0.0 -2040,16,,GASNAT,autumn.evening,0.0 -2040,16,,CO2EMT,autumn.evening,0.0 -2040,17,,GASPRD,winter.night,25.834226877091545 -2040,17,,CO2EMT,winter.night,132.0904020225691 -2040,17,,GASPRD,winter.day,36.90603834523107 -2040,17,,CO2EMT,winter.day,188.70057405916646 -2040,17,,GASPRD,winter.peak,11.071811468139524 -2040,17,,CO2EMT,winter.peak,56.61017203659739 -2040,17,,GASPRD,winter.evening,14.76241540895202 -2040,17,,CO2EMT,winter.evening,75.48022998597169 -2040,17,,GASPRD,peak.night,25.834226877091545 -2040,17,,CO2EMT,peak.night,132.0904020225691 -2040,17,,GASPRD,peak.day,36.90603834523107 -2040,17,,CO2EMT,peak.day,188.70057405916646 -2040,17,,GASPRD,peak.peak,11.071811468139524 -2040,17,,CO2EMT,peak.peak,56.61017203659739 -2040,17,,GASPRD,peak.evening,14.76241540895202 -2040,17,,CO2EMT,peak.evening,75.48022998597169 +2040,16,,GASNAT,autumn.peak,-0.5817430444605374 +2040,16,,ELCTRI,autumn.peak,0.3878286963070249 +2040,16,,CO2EMT,autumn.peak,29.74452186326727 +2040,16,,GASNAT,autumn.evening,-0.38330654262806424 +2040,16,,ELCTRI,autumn.evening,0.25553769508537616 +2040,16,,CO2EMT,autumn.evening,19.598463524572924 +2040,17,,GASPRD,winter.night,0.0 +2040,17,,CO2EMT,winter.night,0.0 +2040,17,,GASPRD,winter.day,0.0 +2040,17,,CO2EMT,winter.day,0.0 +2040,17,,GASPRD,winter.peak,0.0 +2040,17,,CO2EMT,winter.peak,0.0 +2040,17,,GASPRD,winter.evening,0.0 +2040,17,,CO2EMT,winter.evening,0.0 +2040,17,,GASPRD,peak.night,0.0 +2040,17,,CO2EMT,peak.night,0.0 +2040,17,,GASPRD,peak.day,0.0 +2040,17,,CO2EMT,peak.day,0.0 +2040,17,,GASPRD,peak.peak,0.0 +2040,17,,CO2EMT,peak.peak,0.0 +2040,17,,GASPRD,peak.evening,0.0 +2040,17,,CO2EMT,peak.evening,0.0 2040,17,,GASPRD,summer.night,0.0 2040,17,,CO2EMT,summer.night,0.0 2040,17,,GASPRD,summer.day,0.0 @@ -857,12 +809,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,17,,CO2EMT,summer.evening,0.0 2040,17,,GASPRD,autumn.night,0.0 2040,17,,CO2EMT,autumn.night,0.0 -2040,17,,GASPRD,autumn.day,12.821263773870898 -2040,17,,CO2EMT,autumn.day,65.55512167580191 -2040,17,,GASPRD,autumn.peak,11.071811468139524 -2040,17,,CO2EMT,autumn.peak,56.61017203659739 -2040,17,,GASPRD,autumn.evening,14.76241540895202 -2040,17,,CO2EMT,autumn.evening,75.48022998597169 +2040,17,,GASPRD,autumn.day,0.0 +2040,17,,CO2EMT,autumn.day,0.0 +2040,17,,GASPRD,autumn.peak,0.0 +2040,17,,CO2EMT,autumn.peak,0.0 +2040,17,,GASPRD,autumn.evening,0.0 +2040,17,,CO2EMT,autumn.evening,0.0 2040,,1,GASNAT,winter.night,-0.0 2040,,1,RSHEAT,winter.night,0.0 2040,,1,CO2EMT,winter.night,0.0 @@ -884,9 +836,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,,1,GASNAT,peak.peak,-48.75610298455206 2040,,1,RSHEAT,peak.peak,42.396611290914834 2040,,1,CO2EMT,peak.peak,2492.8995456001467 -2040,,1,GASNAT,peak.evening,-0.8155369150912786 -2040,,1,RSHEAT,peak.evening,0.7091625348619814 -2040,,1,CO2EMT,peak.evening,41.69840246861708 +2040,,1,GASNAT,peak.evening,-13.973215069164338 +2040,,1,RSHEAT,peak.evening,12.150621799273338 +2040,,1,CO2EMT,peak.evening,714.4504864863727 2040,,1,GASNAT,summer.night,-0.0 2040,,1,RSHEAT,summer.night,0.0 2040,,1,CO2EMT,summer.night,0.0 @@ -905,9 +857,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,,1,GASNAT,autumn.day,-0.0 2040,,1,RSHEAT,autumn.day,0.0 2040,,1,CO2EMT,autumn.day,0.0 -2040,,1,GASNAT,autumn.peak,-31.078672579349053 -2040,,1,RSHEAT,autumn.peak,27.02493267769483 -2040,,1,CO2EMT,autumn.peak,1589.0525289821173 +2040,,1,GASNAT,autumn.peak,-35.74366755434908 +2040,,1,RSHEAT,autumn.peak,31.081450047260073 +2040,,1,CO2EMT,autumn.peak,1827.5737220538688 2040,,1,GASNAT,autumn.evening,-0.0 2040,,1,RSHEAT,autumn.evening,0.0 2040,,1,CO2EMT,autumn.evening,0.0 diff --git a/tests/data/simple_divisible/commodity_prices.csv b/tests/data/simple_divisible/commodity_prices.csv index 0140863f4..fab94b5d1 100644 --- a/tests/data/simple_divisible/commodity_prices.csv +++ b/tests/data/simple_divisible/commodity_prices.csv @@ -63,131 +63,131 @@ milestone_year,commodity_id,region_id,time_slice,price 2020,RSHEAT,GBR,autumn.day,50.81518243617669 2020,RSHEAT,GBR,autumn.peak,56.747895139472185 2020,RSHEAT,GBR,autumn.evening,49.62095012923007 -2030,GASPRD,GBR,winter.night,10.773099486681053 -2030,GASPRD,GBR,winter.day,10.773099486681053 -2030,GASPRD,GBR,winter.peak,10.773099486681053 -2030,GASPRD,GBR,winter.evening,10.773099486681053 -2030,GASPRD,GBR,peak.night,10.773099486681053 -2030,GASPRD,GBR,peak.day,10.773099486681053 -2030,GASPRD,GBR,peak.peak,10.773099486681053 -2030,GASPRD,GBR,peak.evening,10.773099486681053 -2030,GASPRD,GBR,summer.night,10.773099486681053 -2030,GASPRD,GBR,summer.day,10.773099486681053 -2030,GASPRD,GBR,summer.peak,10.773099486681053 -2030,GASPRD,GBR,summer.evening,10.773099486681053 -2030,GASPRD,GBR,autumn.night,10.773099486681053 -2030,GASPRD,GBR,autumn.day,10.773099486681053 -2030,GASPRD,GBR,autumn.peak,10.773099486681053 -2030,GASPRD,GBR,autumn.evening,10.773099486681053 -2030,GASNAT,GBR,winter.night,17.865526588528397 -2030,GASNAT,GBR,winter.day,17.865526588528397 -2030,GASNAT,GBR,winter.peak,17.865526588528397 -2030,GASNAT,GBR,winter.evening,17.865526588528397 -2030,GASNAT,GBR,peak.night,17.865526588528397 -2030,GASNAT,GBR,peak.day,17.865526588528397 -2030,GASNAT,GBR,peak.peak,17.865526588528397 -2030,GASNAT,GBR,peak.evening,17.865526588528397 -2030,GASNAT,GBR,summer.night,17.865526588528393 -2030,GASNAT,GBR,summer.day,17.865526588528393 -2030,GASNAT,GBR,summer.peak,17.865526588528393 -2030,GASNAT,GBR,summer.evening,17.865526588528393 -2030,GASNAT,GBR,autumn.night,17.865526588528397 -2030,GASNAT,GBR,autumn.day,17.865526588528397 -2030,GASNAT,GBR,autumn.peak,17.865526588528397 -2030,GASNAT,GBR,autumn.evening,17.865526588528397 -2030,ELCTRI,GBR,winter.night,13.631754077557693 -2030,ELCTRI,GBR,winter.day,13.439929357496016 -2030,ELCTRI,GBR,winter.peak,13.691668944873948 -2030,ELCTRI,GBR,winter.evening,13.608917800796501 -2030,ELCTRI,GBR,peak.night,25.06535106713098 -2030,ELCTRI,GBR,peak.day,13.622619564825067 -2030,ELCTRI,GBR,peak.peak,15.332635253194951 -2030,ELCTRI,GBR,peak.evening,24.088331999799514 -2030,ELCTRI,GBR,summer.night,13.039931526574689 -2030,ELCTRI,GBR,summer.day,13.039931526574687 -2030,ELCTRI,GBR,summer.peak,13.039931526574687 -2030,ELCTRI,GBR,summer.evening,13.039931526574687 -2030,ELCTRI,GBR,autumn.night,16.474084366220488 -2030,ELCTRI,GBR,autumn.day,14.918729564903156 -2030,ELCTRI,GBR,autumn.peak,19.47169192403599 -2030,ELCTRI,GBR,autumn.evening,21.700414692417855 -2030,RSHEAT,GBR,winter.night,45.72046148521543 -2030,RSHEAT,GBR,winter.day,62.49782906534938 -2030,RSHEAT,GBR,winter.peak,67.1416489506587 -2030,RSHEAT,GBR,winter.evening,60.38524435811668 -2030,RSHEAT,GBR,peak.night,37.80522622656159 -2030,RSHEAT,GBR,peak.day,52.393289329512015 -2030,RSHEAT,GBR,peak.peak,62.73140016291646 -2030,RSHEAT,GBR,peak.evening,50.648924330557946 -2030,RSHEAT,GBR,summer.night,31.401235356328872 -2030,RSHEAT,GBR,summer.day,31.401235356328876 -2030,RSHEAT,GBR,summer.peak,31.401235356328872 -2030,RSHEAT,GBR,summer.evening,31.40123535632887 -2030,RSHEAT,GBR,autumn.night,34.601432879373625 -2030,RSHEAT,GBR,autumn.day,47.32809914048013 -2030,RSHEAT,GBR,autumn.peak,60.31953577643984 -2030,RSHEAT,GBR,autumn.evening,43.670609708599095 -2040,GASPRD,GBR,winter.night,19.91037282435061 -2040,GASPRD,GBR,winter.day,19.91037282435061 -2040,GASPRD,GBR,winter.peak,19.91037282435061 -2040,GASPRD,GBR,winter.evening,19.91037282435061 -2040,GASPRD,GBR,peak.night,4.545787335259103 -2040,GASPRD,GBR,peak.day,4.545787335259103 -2040,GASPRD,GBR,peak.peak,4.545787335259103 -2040,GASPRD,GBR,peak.evening,4.545787335259103 -2040,GASPRD,GBR,summer.night,4.505735628038381 -2040,GASPRD,GBR,summer.day,4.505735628038381 -2040,GASPRD,GBR,summer.peak,4.505735628038381 -2040,GASPRD,GBR,summer.evening,4.505735628038381 -2040,GASPRD,GBR,autumn.night,4.505735628038381 -2040,GASPRD,GBR,autumn.day,4.505735628038381 -2040,GASPRD,GBR,autumn.peak,4.505735628038381 -2040,GASPRD,GBR,autumn.evening,4.505735628038381 -2040,GASNAT,GBR,winter.night,32.1266781604161 -2040,GASNAT,GBR,winter.day,32.1266781604161 -2040,GASNAT,GBR,winter.peak,32.1266781604161 -2040,GASNAT,GBR,winter.evening,32.1266781604161 -2040,GASNAT,GBR,peak.night,9.312748526114701 -2040,GASNAT,GBR,peak.day,9.312748526114701 -2040,GASNAT,GBR,peak.peak,9.312748526114701 -2040,GASNAT,GBR,peak.evening,9.312748526114701 -2040,GASNAT,GBR,summer.night,9.257988415062057 -2040,GASNAT,GBR,summer.day,9.257988415062057 -2040,GASNAT,GBR,summer.peak,9.257988415062057 -2040,GASNAT,GBR,summer.evening,9.257988415062057 -2040,GASNAT,GBR,autumn.night,15.951809104288255 -2040,GASNAT,GBR,autumn.day,15.951809104288255 -2040,GASNAT,GBR,autumn.peak,15.951809104288255 -2040,GASNAT,GBR,autumn.evening,15.951809104288255 -2040,ELCTRI,GBR,winter.night,13.932854561272709 -2040,ELCTRI,GBR,winter.day,13.824086012661564 -2040,ELCTRI,GBR,winter.peak,14.121889903377213 -2040,ELCTRI,GBR,winter.evening,14.208460808278012 -2040,ELCTRI,GBR,peak.night,14.561231270638833 -2040,ELCTRI,GBR,peak.day,14.239626328506523 -2040,ELCTRI,GBR,peak.peak,16.983474906800666 -2040,ELCTRI,GBR,peak.evening,27.362337371325197 -2040,ELCTRI,GBR,summer.night,12.823327167036597 -2040,ELCTRI,GBR,summer.day,12.823327167036597 -2040,ELCTRI,GBR,summer.peak,12.823327167036597 -2040,ELCTRI,GBR,summer.evening,12.823327167036597 -2040,ELCTRI,GBR,autumn.night,13.396094038602119 -2040,ELCTRI,GBR,autumn.day,15.355761088824101 -2040,ELCTRI,GBR,autumn.peak,24.016377642320677 -2040,ELCTRI,GBR,autumn.evening,17.647506742698756 -2040,RSHEAT,GBR,winter.night,37.010557092185394 -2040,RSHEAT,GBR,winter.day,79.30742714245245 -2040,RSHEAT,GBR,winter.peak,92.57289821164417 -2040,RSHEAT,GBR,winter.evening,73.27754469063328 -2040,RSHEAT,GBR,peak.night,35.17957142812148 -2040,RSHEAT,GBR,peak.day,46.07970179249751 -2040,RSHEAT,GBR,peak.peak,65.43902957578659 -2040,RSHEAT,GBR,peak.evening,42.95372968084946 -2040,RSHEAT,GBR,summer.night,34.60606307393274 -2040,RSHEAT,GBR,summer.day,34.60606307393274 -2040,RSHEAT,GBR,summer.peak,34.60606307393274 -2040,RSHEAT,GBR,summer.evening,34.60606307393274 -2040,RSHEAT,GBR,autumn.night,34.79507614154936 -2040,RSHEAT,GBR,autumn.day,37.955101587063844 -2040,RSHEAT,GBR,autumn.peak,64.69658630054313 -2040,RSHEAT,GBR,autumn.evening,36.71727436256988 +2030,GASPRD,GBR,winter.night,10.468549943945368 +2030,GASPRD,GBR,winter.day,10.468549943945368 +2030,GASPRD,GBR,winter.peak,10.468549943945368 +2030,GASPRD,GBR,winter.evening,10.468549943945368 +2030,GASPRD,GBR,peak.night,10.468549943945368 +2030,GASPRD,GBR,peak.day,10.468549943945368 +2030,GASPRD,GBR,peak.peak,10.468549943945368 +2030,GASPRD,GBR,peak.evening,10.468549943945368 +2030,GASPRD,GBR,summer.night,10.468549943945368 +2030,GASPRD,GBR,summer.day,10.468549943945368 +2030,GASPRD,GBR,summer.peak,10.468549943945368 +2030,GASPRD,GBR,summer.evening,10.468549943945368 +2030,GASPRD,GBR,autumn.night,10.468549943945368 +2030,GASPRD,GBR,autumn.day,10.468549943945368 +2030,GASPRD,GBR,autumn.peak,10.468549943945368 +2030,GASPRD,GBR,autumn.evening,10.468549943945368 +2030,GASNAT,GBR,winter.night,17.334217388807744 +2030,GASNAT,GBR,winter.day,17.334217388807744 +2030,GASNAT,GBR,winter.peak,17.334217388807744 +2030,GASNAT,GBR,winter.evening,17.334217388807744 +2030,GASNAT,GBR,peak.night,17.33421738880774 +2030,GASNAT,GBR,peak.day,17.33421738880774 +2030,GASNAT,GBR,peak.peak,17.33421738880774 +2030,GASNAT,GBR,peak.evening,17.33421738880774 +2030,GASNAT,GBR,summer.night,17.33421738880774 +2030,GASNAT,GBR,summer.day,17.33421738880774 +2030,GASNAT,GBR,summer.peak,17.33421738880774 +2030,GASNAT,GBR,summer.evening,17.33421738880774 +2030,GASNAT,GBR,autumn.night,17.334217388807744 +2030,GASNAT,GBR,autumn.day,17.334217388807744 +2030,GASNAT,GBR,autumn.peak,17.334217388807744 +2030,GASNAT,GBR,autumn.evening,17.334217388807744 +2030,ELCTRI,GBR,winter.night,13.907094218154354 +2030,ELCTRI,GBR,winter.day,13.314320028089643 +2030,ELCTRI,GBR,winter.peak,13.403862359344389 +2030,ELCTRI,GBR,winter.evening,13.589417839864018 +2030,ELCTRI,GBR,peak.night,16.178837903407775 +2030,ELCTRI,GBR,peak.day,13.780023638624593 +2030,ELCTRI,GBR,peak.peak,15.38958390513805 +2030,ELCTRI,GBR,peak.evening,16.043248808600694 +2030,ELCTRI,GBR,summer.night,12.959346083679794 +2030,ELCTRI,GBR,summer.day,12.959346083679792 +2030,ELCTRI,GBR,summer.peak,12.959346083679794 +2030,ELCTRI,GBR,summer.evening,12.959346083679796 +2030,ELCTRI,GBR,autumn.night,15.908102449681287 +2030,ELCTRI,GBR,autumn.day,15.114264371016725 +2030,ELCTRI,GBR,autumn.peak,15.65253635584373 +2030,ELCTRI,GBR,autumn.evening,15.825488707155777 +2030,RSHEAT,GBR,winter.night,46.12776456839725 +2030,RSHEAT,GBR,winter.day,60.76370996194052 +2030,RSHEAT,GBR,winter.peak,64.83455723582352 +2030,RSHEAT,GBR,winter.evening,58.92273963230854 +2030,RSHEAT,GBR,peak.night,45.61217165866135 +2030,RSHEAT,GBR,peak.day,51.943868962576786 +2030,RSHEAT,GBR,peak.peak,61.008747367169285 +2030,RSHEAT,GBR,peak.evening,54.172527876078675 +2030,RSHEAT,GBR,summer.night,37.625209294818106 +2030,RSHEAT,GBR,summer.day,32.458625104785696 +2030,RSHEAT,GBR,summer.peak,32.458625104785696 +2030,RSHEAT,GBR,summer.evening,37.625209294818106 +2030,RSHEAT,GBR,autumn.night,36.457048637455934 +2030,RSHEAT,GBR,autumn.day,47.552345497503 +2030,RSHEAT,GBR,autumn.peak,59.90283361799326 +2030,RSHEAT,GBR,autumn.evening,47.774379529301605 +2040,GASPRD,GBR,winter.night,14.151742311133322 +2040,GASPRD,GBR,winter.day,14.151742311133322 +2040,GASPRD,GBR,winter.peak,14.151742311133322 +2040,GASPRD,GBR,winter.evening,14.151742311133322 +2040,GASPRD,GBR,peak.night,14.151742311133324 +2040,GASPRD,GBR,peak.day,14.151742311133324 +2040,GASPRD,GBR,peak.peak,14.151742311133324 +2040,GASPRD,GBR,peak.evening,14.151742311133324 +2040,GASPRD,GBR,summer.night,14.151742311133322 +2040,GASPRD,GBR,summer.day,14.151742311133322 +2040,GASPRD,GBR,summer.peak,14.151742311133322 +2040,GASPRD,GBR,summer.evening,14.151742311133322 +2040,GASPRD,GBR,autumn.night,14.151742311133322 +2040,GASPRD,GBR,autumn.day,14.151742311133322 +2040,GASPRD,GBR,autumn.peak,14.151742311133322 +2040,GASPRD,GBR,autumn.evening,14.151742311133322 +2040,GASNAT,GBR,winter.night,23.759818857289424 +2040,GASNAT,GBR,winter.day,23.759818857289424 +2040,GASNAT,GBR,winter.peak,23.759818857289424 +2040,GASNAT,GBR,winter.evening,23.759818857289424 +2040,GASNAT,GBR,peak.night,23.759818857289428 +2040,GASNAT,GBR,peak.day,23.759818857289428 +2040,GASNAT,GBR,peak.peak,23.759818857289428 +2040,GASNAT,GBR,peak.evening,23.759818857289428 +2040,GASNAT,GBR,summer.night,23.75981885728942 +2040,GASNAT,GBR,summer.day,23.75981885728942 +2040,GASNAT,GBR,summer.peak,23.75981885728942 +2040,GASNAT,GBR,summer.evening,23.75981885728942 +2040,GASNAT,GBR,autumn.night,23.759818857289424 +2040,GASNAT,GBR,autumn.day,23.759818857289424 +2040,GASNAT,GBR,autumn.peak,23.759818857289424 +2040,GASNAT,GBR,autumn.evening,23.759818857289424 +2040,ELCTRI,GBR,winter.night,13.899192344030249 +2040,ELCTRI,GBR,winter.day,13.808959041104218 +2040,ELCTRI,GBR,winter.peak,14.056014178150905 +2040,ELCTRI,GBR,winter.evening,14.37164874439534 +2040,ELCTRI,GBR,peak.night,15.117602737417169 +2040,ELCTRI,GBR,peak.day,14.671874228410575 +2040,ELCTRI,GBR,peak.peak,17.47042644265812 +2040,ELCTRI,GBR,peak.evening,18.58822122642022 +2040,ELCTRI,GBR,summer.night,12.839109234384157 +2040,ELCTRI,GBR,summer.day,12.839109234384157 +2040,ELCTRI,GBR,summer.peak,12.839109234384157 +2040,ELCTRI,GBR,summer.evening,12.839109234384157 +2040,ELCTRI,GBR,autumn.night,13.381227099400746 +2040,ELCTRI,GBR,autumn.day,15.494268572100248 +2040,ELCTRI,GBR,autumn.peak,17.920092451737336 +2040,ELCTRI,GBR,autumn.evening,17.345248377783996 +2040,RSHEAT,GBR,winter.night,37.891329966346376 +2040,RSHEAT,GBR,winter.day,72.91612063830392 +2040,RSHEAT,GBR,winter.peak,83.74437999036013 +2040,RSHEAT,GBR,winter.evening,68.03785335271097 +2040,RSHEAT,GBR,peak.night,35.400817314308355 +2040,RSHEAT,GBR,peak.day,49.488632812871785 +2040,RSHEAT,GBR,peak.peak,73.57588451795222 +2040,RSHEAT,GBR,peak.evening,53.2560492630068 +2040,RSHEAT,GBR,summer.night,34.64891445830746 +2040,RSHEAT,GBR,summer.day,34.64891445830746 +2040,RSHEAT,GBR,summer.peak,34.64891445830746 +2040,RSHEAT,GBR,summer.evening,34.64891445830746 +2040,RSHEAT,GBR,autumn.night,34.827813353762934 +2040,RSHEAT,GBR,autumn.day,39.091748809170404 +2040,RSHEAT,GBR,autumn.peak,69.97875970580725 +2040,RSHEAT,GBR,autumn.evening,36.87277379184398 diff --git a/tests/data/simple_full/commodity_flows.csv b/tests/data/simple_full/commodity_flows.csv index 848337bca..e0427fc83 100644 --- a/tests/data/simple_full/commodity_flows.csv +++ b/tests/data/simple_full/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,46 +591,46 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 -2040,6,,GASNAT,winter.night,-29.838533129172095 -2040,6,,RSHEAT,winter.night,25.94655054710617 -2040,6,,CO2EMT,winter.night,1525.6441988945694 -2040,6,,GASNAT,winter.day,-42.62647584035811 -2040,6,,RSHEAT,winter.day,37.066500730746185 -2040,6,,CO2EMT,winter.day,2179.4917097175103 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 +2040,6,,GASNAT,winter.night,-0.0 +2040,6,,RSHEAT,winter.night,0.0 +2040,6,,CO2EMT,winter.night,0.0 +2040,6,,GASNAT,winter.day,-0.0 +2040,6,,RSHEAT,winter.day,0.0 +2040,6,,CO2EMT,winter.day,0.0 2040,6,,GASNAT,winter.peak,-12.786113347771423 2040,6,,RSHEAT,winter.peak,11.118359432844716 2040,6,,CO2EMT,winter.peak,653.753975471553 -2040,6,,GASNAT,winter.evening,-17.050590417986076 -2040,6,,RSHEAT,winter.evening,14.826600363466154 -2040,6,,CO2EMT,winter.evening,871.7966880716282 -2040,6,,GASNAT,peak.night,-29.838533129172095 -2040,6,,RSHEAT,peak.night,25.94655054710617 -2040,6,,CO2EMT,peak.night,1525.6441988945694 -2040,6,,GASNAT,peak.day,-42.62647584035811 -2040,6,,RSHEAT,peak.day,37.066500730746185 -2040,6,,CO2EMT,peak.day,2179.4917097175103 -2040,6,,GASNAT,peak.peak,-12.787942711186016 -2040,6,,RSHEAT,peak.peak,11.119950183640015 -2040,6,,CO2EMT,peak.peak,653.8475108229411 -2040,6,,GASNAT,peak.evening,-17.050590417986076 -2040,6,,RSHEAT,peak.evening,14.826600363466154 -2040,6,,CO2EMT,peak.evening,871.7966880716282 +2040,6,,GASNAT,winter.evening,-0.0 +2040,6,,RSHEAT,winter.evening,0.0 +2040,6,,CO2EMT,winter.evening,0.0 +2040,6,,GASNAT,peak.night,-0.0 +2040,6,,RSHEAT,peak.night,0.0 +2040,6,,CO2EMT,peak.night,0.0 +2040,6,,GASNAT,peak.day,-0.0 +2040,6,,RSHEAT,peak.day,0.0 +2040,6,,CO2EMT,peak.day,0.0 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,RSHEAT,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 +2040,6,,GASNAT,peak.evening,-0.0 +2040,6,,RSHEAT,peak.evening,0.0 +2040,6,,CO2EMT,peak.evening,0.0 2040,6,,GASNAT,summer.night,-0.0 2040,6,,RSHEAT,summer.night,0.0 2040,6,,CO2EMT,summer.night,0.0 @@ -643,34 +643,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,summer.evening,-0.0 2040,6,,RSHEAT,summer.evening,0.0 2040,6,,CO2EMT,summer.evening,0.0 -2040,6,,GASNAT,autumn.night,-29.838533129172095 -2040,6,,RSHEAT,autumn.night,25.94655054710617 -2040,6,,CO2EMT,autumn.night,1525.6441988945694 -2040,6,,GASNAT,autumn.day,-42.62647584035811 -2040,6,,RSHEAT,autumn.day,37.066500730746185 -2040,6,,CO2EMT,autumn.day,2179.4917097175103 -2040,6,,GASNAT,autumn.peak,-12.787942711186016 -2040,6,,RSHEAT,autumn.peak,11.119950183640015 -2040,6,,CO2EMT,autumn.peak,653.8475108229411 -2040,6,,GASNAT,autumn.evening,-17.050590417986076 -2040,6,,RSHEAT,autumn.evening,14.826600363466154 -2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,6,,GASNAT,autumn.night,-0.0 +2040,6,,RSHEAT,autumn.night,0.0 +2040,6,,CO2EMT,autumn.night,0.0 +2040,6,,GASNAT,autumn.day,-0.0 +2040,6,,RSHEAT,autumn.day,0.0 +2040,6,,CO2EMT,autumn.day,0.0 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 +2040,6,,GASNAT,autumn.evening,-0.0 +2040,6,,RSHEAT,autumn.evening,0.0 +2040,6,,CO2EMT,autumn.evening,0.0 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,ELCTRI,winter.night,-2.71398300195538 2040,9,,RSHEAT,winter.night,8.224190915016303 2040,9,,ELCTRI,winter.day,-3.8771185689047805 @@ -703,30 +703,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,9,,RSHEAT,autumn.peak,3.5246532331800005 2040,9,,ELCTRI,autumn.evening,-1.5508474350059795 2040,9,,RSHEAT,autumn.evening,4.6995376818363015 -2040,10,,GASNAT,winter.night,-45.62106563892816 -2040,10,,RSHEAT,winter.night,39.670491859937535 -2040,10,,CO2EMT,winter.night,2332.605086118397 -2040,10,,GASNAT,winter.day,-237.06042122445515 -2040,10,,RSHEAT,winter.day,206.13949671691753 -2040,10,,CO2EMT,winter.day,12120.899337206392 +2040,10,,GASNAT,winter.night,-75.45959876810025 +2040,10,,RSHEAT,winter.night,65.6170424070437 +2040,10,,CO2EMT,winter.night,3858.249285012966 +2040,10,,GASNAT,winter.day,-279.68689706481325 +2040,10,,RSHEAT,winter.day,243.20599744766372 +2040,10,,CO2EMT,winter.day,14300.391046923904 2040,10,,GASNAT,winter.peak,-127.32947236525759 2040,10,,RSHEAT,winter.peak,110.7212803176153 2040,10,,CO2EMT,winter.peak,6510.355922035621 -2040,10,,GASNAT,winter.evening,-76.97045100924117 -2040,10,,RSHEAT,winter.evening,66.93082696455755 -2040,10,,CO2EMT,winter.evening,3935.499160102502 -2040,10,,GASNAT,peak.night,-20.19030718359216 -2040,10,,RSHEAT,peak.night,17.556788855297533 -2040,10,,CO2EMT,peak.night,1032.3304062970674 -2040,10,,GASNAT,peak.day,-102.01801896162715 -2040,10,,RSHEAT,peak.day,88.71132083619753 -2040,10,,CO2EMT,peak.day,5216.181309507997 -2040,10,,GASNAT,peak.peak,-71.49541567696298 -2040,10,,RSHEAT,peak.peak,62.16992667561999 -2040,10,,CO2EMT,peak.peak,3655.5606035631176 -2040,10,,GASNAT,peak.evening,-31.134620747525183 -2040,10,,RSHEAT,peak.evening,27.07358325871755 -2040,10,,CO2EMT,peak.evening,1591.9131588209627 +2040,10,,GASNAT,winter.evening,-94.02104142722726 +2040,10,,RSHEAT,winter.evening,81.75742732802371 +2040,10,,CO2EMT,winter.evening,4807.295848174131 +2040,10,,GASNAT,peak.night,-50.02884031276425 +2040,10,,RSHEAT,peak.night,43.503339402403704 +2040,10,,CO2EMT,peak.night,2557.974605191637 +2040,10,,GASNAT,peak.day,-144.64449480198527 +2040,10,,RSHEAT,peak.day,125.77782156694371 +2040,10,,CO2EMT,peak.day,7395.673019225507 +2040,10,,GASNAT,peak.peak,-84.283358388149 +2040,10,,RSHEAT,peak.peak,73.28987685926 +2040,10,,CO2EMT,peak.peak,4309.4081143860585 +2040,10,,GASNAT,peak.evening,-48.185211165511255 +2040,10,,RSHEAT,peak.evening,41.900183622183704 +2040,10,,CO2EMT,peak.evening,2463.7098468925906 2040,10,,GASNAT,summer.night,-0.0 2040,10,,RSHEAT,summer.night,0.0 2040,10,,CO2EMT,summer.night,0.0 @@ -739,15 +739,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,10,,GASNAT,summer.evening,-0.0 2040,10,,RSHEAT,summer.evening,0.0 2040,10,,CO2EMT,summer.evening,0.0 -2040,10,,GASNAT,autumn.night,-9.02249651780516 -2040,10,,RSHEAT,autumn.night,7.845649145917532 -2040,10,,CO2EMT,autumn.night,461.32024695537797 -2040,10,,GASNAT,autumn.day,-71.03085431091114 -2040,10,,RSHEAT,autumn.day,61.76596027035752 -2040,10,,CO2EMT,autumn.day,3631.8075809168868 -2040,10,,GASNAT,autumn.peak,-53.81798527175999 -2040,10,,RSHEAT,autumn.peak,46.79824806239999 -2040,10,,CO2EMT,autumn.peak,2751.7135869450885 -2040,10,,GASNAT,autumn.evening,-19.838341184908174 -2040,10,,RSHEAT,autumn.evening,17.250731465137545 -2040,10,,CO2EMT,autumn.evening,1014.334384784355 +2040,10,,GASNAT,autumn.night,-38.86102964697726 +2040,10,,RSHEAT,autumn.night,33.792199693023704 +2040,10,,CO2EMT,autumn.night,1986.9644458499474 +2040,10,,GASNAT,autumn.day,-113.65733015126926 +2040,10,,RSHEAT,autumn.day,98.83246100110371 +2040,10,,CO2EMT,autumn.day,5811.299290634398 +2040,10,,GASNAT,autumn.peak,-66.605927982946 +2040,10,,RSHEAT,autumn.peak,57.918198246040006 +2040,10,,CO2EMT,autumn.peak,3405.5610977680294 +2040,10,,GASNAT,autumn.evening,-36.888931602894246 +2040,10,,RSHEAT,autumn.evening,32.0773318286037 +2040,10,,CO2EMT,autumn.evening,1886.1310728559831 diff --git a/tests/data/simple_full/commodity_prices.csv b/tests/data/simple_full/commodity_prices.csv index 0421fb8e2..61efb0da6 100644 --- a/tests/data/simple_full/commodity_prices.csv +++ b/tests/data/simple_full/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -159,35 +159,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,10.866957996006988 2040,GASNAT,GBR,autumn.peak,10.866957996006988 2040,GASNAT,GBR,autumn.evening,10.866957996006988 -2040,ELCTRI,GBR,winter.night,18.40751185337733 -2040,ELCTRI,GBR,winter.day,18.40751185337733 -2040,ELCTRI,GBR,winter.peak,18.40751185337733 -2040,ELCTRI,GBR,winter.evening,18.40751185337733 -2040,ELCTRI,GBR,peak.night,18.40751185337733 -2040,ELCTRI,GBR,peak.day,18.40751185337733 -2040,ELCTRI,GBR,peak.peak,18.40751185337733 -2040,ELCTRI,GBR,peak.evening,18.40751185337733 -2040,ELCTRI,GBR,summer.night,278.4706392854486 -2040,ELCTRI,GBR,summer.day,18.40751185337733 -2040,ELCTRI,GBR,summer.peak,18.40751185337733 -2040,ELCTRI,GBR,summer.evening,18.40751185337733 -2040,ELCTRI,GBR,autumn.night,18.40751185337733 -2040,ELCTRI,GBR,autumn.day,18.40751185337733 -2040,ELCTRI,GBR,autumn.peak,18.40751185337733 -2040,ELCTRI,GBR,autumn.evening,18.40751185337733 -2040,RSHEAT,GBR,winter.night,43.53782587892427 -2040,RSHEAT,GBR,winter.day,51.57242660228903 -2040,RSHEAT,GBR,winter.peak,53.783649010260156 -2040,RSHEAT,GBR,winter.evening,50.55418775096135 -2040,RSHEAT,GBR,peak.night,37.67886076810967 -2040,RSHEAT,GBR,peak.day,46.73065586147608 -2040,RSHEAT,GBR,peak.peak,51.59664538797137 -2040,RSHEAT,GBR,peak.evening,44.83326564417469 -2040,RSHEAT,GBR,summer.night,115.51710470345496 -2040,RSHEAT,GBR,summer.day,29.696272650871435 -2040,RSHEAT,GBR,summer.peak,29.696272650871432 -2040,RSHEAT,GBR,summer.evening,29.696272650871435 -2040,RSHEAT,GBR,autumn.night,33.15707647035864 -2040,RSHEAT,GBR,autumn.day,44.169137586854056 -2040,RSHEAT,GBR,autumn.peak,50.18407566644177 -2040,RSHEAT,GBR,autumn.evening,41.51873841477455 +2040,ELCTRI,GBR,winter.night,17.314767437204573 +2040,ELCTRI,GBR,winter.day,17.314767437204573 +2040,ELCTRI,GBR,winter.peak,17.314767437204573 +2040,ELCTRI,GBR,winter.evening,17.314767437204573 +2040,ELCTRI,GBR,peak.night,17.314767437204573 +2040,ELCTRI,GBR,peak.day,17.314767437204573 +2040,ELCTRI,GBR,peak.peak,17.314767437204573 +2040,ELCTRI,GBR,peak.evening,17.314767437204573 +2040,ELCTRI,GBR,summer.night,207.7596152550184 +2040,ELCTRI,GBR,summer.day,17.314767437204573 +2040,ELCTRI,GBR,summer.peak,17.314767437204573 +2040,ELCTRI,GBR,summer.evening,232.6474400224208 +2040,ELCTRI,GBR,autumn.night,17.314767437204573 +2040,ELCTRI,GBR,autumn.day,17.314767437204573 +2040,ELCTRI,GBR,autumn.peak,17.314767437204573 +2040,ELCTRI,GBR,autumn.evening,17.314767437204573 +2040,RSHEAT,GBR,winter.night,44.6159319641907 +2040,RSHEAT,GBR,winter.day,45.73870127589408 +2040,RSHEAT,GBR,winter.peak,68.7169731750329 +2040,RSHEAT,GBR,winter.evening,45.59641077837997 +2040,RSHEAT,GBR,peak.night,43.79718981990048 +2040,RSHEAT,GBR,peak.day,45.06210367145064 +2040,RSHEAT,GBR,peak.peak,45.74208565182849 +2040,RSHEAT,GBR,peak.evening,44.79695900755749 +2040,RSHEAT,GBR,summer.night,92.182466773413 +2040,RSHEAT,GBR,summer.day,29.335666993534428 +2040,RSHEAT,GBR,summer.peak,29.335666993534428 +2040,RSHEAT,GBR,summer.evening,100.39544894665578 +2040,RSHEAT,GBR,autumn.night,43.165307686804155 +2040,RSHEAT,GBR,autumn.day,44.70415257852956 +2040,RSHEAT,GBR,autumn.peak,45.544690661264404 +2040,RSHEAT,GBR,autumn.evening,44.333781111840324 diff --git a/tests/data/simple_ironing_out/commodity_flows.csv b/tests/data/simple_ironing_out/commodity_flows.csv index f3bdf1820..61bf1dc58 100644 --- a/tests/data/simple_ironing_out/commodity_flows.csv +++ b/tests/data/simple_ironing_out/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,31 +591,31 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 2040,6,,GASNAT,winter.night,-29.838533129172095 2040,6,,RSHEAT,winter.night,25.94655054710617 2040,6,,CO2EMT,winter.night,1525.6441988945694 2040,6,,GASNAT,winter.day,-42.62647584035811 2040,6,,RSHEAT,winter.day,37.066500730746185 2040,6,,CO2EMT,winter.day,2179.4917097175103 -2040,6,,GASNAT,winter.peak,-12.786113347771419 -2040,6,,RSHEAT,winter.peak,11.118359432844713 -2040,6,,CO2EMT,winter.peak,653.7539754715527 +2040,6,,GASNAT,winter.peak,-12.787942711186016 +2040,6,,RSHEAT,winter.peak,11.119950183640015 +2040,6,,CO2EMT,winter.peak,653.8475108229411 2040,6,,GASNAT,winter.evening,-17.050590417986076 2040,6,,RSHEAT,winter.evening,14.826600363466154 2040,6,,CO2EMT,winter.evening,871.7966880716282 @@ -655,31 +655,31 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,autumn.evening,-17.050590417986076 2040,6,,RSHEAT,autumn.evening,14.826600363466154 2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,GASNAT,winter.night,-45.62106563892816 2040,9,,RSHEAT,winter.night,39.670491859937535 2040,9,,CO2EMT,winter.night,2332.605086118397 2040,9,,GASNAT,winter.day,-237.06042122445515 2040,9,,RSHEAT,winter.day,206.13949671691753 2040,9,,CO2EMT,winter.day,12120.899337206392 -2040,9,,GASNAT,winter.peak,-127.32947236525759 -2040,9,,RSHEAT,winter.peak,110.7212803176153 -2040,9,,CO2EMT,winter.peak,6510.355922035621 +2040,9,,GASNAT,winter.peak,-127.32764300184299 +2040,9,,RSHEAT,winter.peak,110.71968956682 +2040,9,,CO2EMT,winter.peak,6510.262386684232 2040,9,,GASNAT,winter.evening,-76.97045100924117 2040,9,,RSHEAT,winter.evening,66.93082696455755 2040,9,,CO2EMT,winter.evening,3935.499160102502 diff --git a/tests/data/simple_ironing_out/commodity_prices.csv b/tests/data/simple_ironing_out/commodity_prices.csv index af18ca08c..863f17973 100644 --- a/tests/data/simple_ironing_out/commodity_prices.csv +++ b/tests/data/simple_ironing_out/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -159,35 +159,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,10.866957996006988 2040,GASNAT,GBR,autumn.peak,10.866957996006988 2040,GASNAT,GBR,autumn.evening,10.866957996006988 -2040,ELCTRI,GBR,winter.night,18.40751185337733 -2040,ELCTRI,GBR,winter.day,18.40751185337733 -2040,ELCTRI,GBR,winter.peak,18.40751185337733 -2040,ELCTRI,GBR,winter.evening,18.40751185337733 -2040,ELCTRI,GBR,peak.night,18.40751185337733 -2040,ELCTRI,GBR,peak.day,18.40751185337733 -2040,ELCTRI,GBR,peak.peak,18.40751185337733 -2040,ELCTRI,GBR,peak.evening,18.40751185337733 -2040,ELCTRI,GBR,summer.night,278.4706392854486 -2040,ELCTRI,GBR,summer.day,18.40751185337733 -2040,ELCTRI,GBR,summer.peak,18.40751185337733 -2040,ELCTRI,GBR,summer.evening,18.40751185337733 -2040,ELCTRI,GBR,autumn.night,18.40751185337733 -2040,ELCTRI,GBR,autumn.day,18.40751185337733 -2040,ELCTRI,GBR,autumn.peak,18.40751185337733 -2040,ELCTRI,GBR,autumn.evening,18.40751185337733 -2040,RSHEAT,GBR,winter.night,43.53782587892427 -2040,RSHEAT,GBR,winter.day,51.57242660228903 -2040,RSHEAT,GBR,winter.peak,53.783649010260156 -2040,RSHEAT,GBR,winter.evening,50.55418775096134 -2040,RSHEAT,GBR,peak.night,37.67886076810967 -2040,RSHEAT,GBR,peak.day,46.73065586147608 -2040,RSHEAT,GBR,peak.peak,51.59664538797137 -2040,RSHEAT,GBR,peak.evening,44.83326564417468 -2040,RSHEAT,GBR,summer.night,115.51710470345496 -2040,RSHEAT,GBR,summer.day,29.696272650871435 -2040,RSHEAT,GBR,summer.peak,29.696272650871432 -2040,RSHEAT,GBR,summer.evening,29.696272650871435 -2040,RSHEAT,GBR,autumn.night,33.15707647035864 -2040,RSHEAT,GBR,autumn.day,44.16913758685406 -2040,RSHEAT,GBR,autumn.peak,50.18407566644177 -2040,RSHEAT,GBR,autumn.evening,41.51873841477455 +2040,ELCTRI,GBR,winter.night,17.314767437204573 +2040,ELCTRI,GBR,winter.day,17.314767437204573 +2040,ELCTRI,GBR,winter.peak,17.314767437204573 +2040,ELCTRI,GBR,winter.evening,17.314767437204573 +2040,ELCTRI,GBR,peak.night,17.314767437204573 +2040,ELCTRI,GBR,peak.day,17.314767437204573 +2040,ELCTRI,GBR,peak.peak,17.314767437204573 +2040,ELCTRI,GBR,peak.evening,17.314767437204573 +2040,ELCTRI,GBR,summer.night,207.7596152550184 +2040,ELCTRI,GBR,summer.day,17.314767437204573 +2040,ELCTRI,GBR,summer.peak,17.314767437204573 +2040,ELCTRI,GBR,summer.evening,232.6474400224208 +2040,ELCTRI,GBR,autumn.night,17.314767437204573 +2040,ELCTRI,GBR,autumn.day,17.314767437204573 +2040,ELCTRI,GBR,autumn.peak,17.314767437204573 +2040,ELCTRI,GBR,autumn.evening,17.314767437204573 +2040,RSHEAT,GBR,winter.night,43.49768572328828 +2040,RSHEAT,GBR,winter.day,51.55587095855007 +2040,RSHEAT,GBR,winter.peak,53.773198870580835 +2040,RSHEAT,GBR,winter.evening,50.5346432012232 +2040,RSHEAT,GBR,peak.night,37.62152239228601 +2040,RSHEAT,GBR,peak.day,46.699887837611335 +2040,RSHEAT,GBR,peak.peak,51.58016083528705 +2040,RSHEAT,GBR,peak.evening,44.796928081300585 +2040,RSHEAT,GBR,summer.night,92.182466773413 +2040,RSHEAT,GBR,summer.day,29.335666993534428 +2040,RSHEAT,GBR,summer.peak,29.335666993534428 +2040,RSHEAT,GBR,summer.evening,100.39544894665578 +2040,RSHEAT,GBR,autumn.night,33.086464992455866 +2040,RSHEAT,GBR,autumn.day,44.13085056356392 +2040,RSHEAT,GBR,autumn.peak,50.163444701440305 +2040,RSHEAT,GBR,autumn.evening,41.47267149389421 diff --git a/tests/data/simple_marginal/commodity_flows.csv b/tests/data/simple_marginal/commodity_flows.csv index 848337bca..e0427fc83 100644 --- a/tests/data/simple_marginal/commodity_flows.csv +++ b/tests/data/simple_marginal/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,46 +591,46 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 -2040,6,,GASNAT,winter.night,-29.838533129172095 -2040,6,,RSHEAT,winter.night,25.94655054710617 -2040,6,,CO2EMT,winter.night,1525.6441988945694 -2040,6,,GASNAT,winter.day,-42.62647584035811 -2040,6,,RSHEAT,winter.day,37.066500730746185 -2040,6,,CO2EMT,winter.day,2179.4917097175103 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 +2040,6,,GASNAT,winter.night,-0.0 +2040,6,,RSHEAT,winter.night,0.0 +2040,6,,CO2EMT,winter.night,0.0 +2040,6,,GASNAT,winter.day,-0.0 +2040,6,,RSHEAT,winter.day,0.0 +2040,6,,CO2EMT,winter.day,0.0 2040,6,,GASNAT,winter.peak,-12.786113347771423 2040,6,,RSHEAT,winter.peak,11.118359432844716 2040,6,,CO2EMT,winter.peak,653.753975471553 -2040,6,,GASNAT,winter.evening,-17.050590417986076 -2040,6,,RSHEAT,winter.evening,14.826600363466154 -2040,6,,CO2EMT,winter.evening,871.7966880716282 -2040,6,,GASNAT,peak.night,-29.838533129172095 -2040,6,,RSHEAT,peak.night,25.94655054710617 -2040,6,,CO2EMT,peak.night,1525.6441988945694 -2040,6,,GASNAT,peak.day,-42.62647584035811 -2040,6,,RSHEAT,peak.day,37.066500730746185 -2040,6,,CO2EMT,peak.day,2179.4917097175103 -2040,6,,GASNAT,peak.peak,-12.787942711186016 -2040,6,,RSHEAT,peak.peak,11.119950183640015 -2040,6,,CO2EMT,peak.peak,653.8475108229411 -2040,6,,GASNAT,peak.evening,-17.050590417986076 -2040,6,,RSHEAT,peak.evening,14.826600363466154 -2040,6,,CO2EMT,peak.evening,871.7966880716282 +2040,6,,GASNAT,winter.evening,-0.0 +2040,6,,RSHEAT,winter.evening,0.0 +2040,6,,CO2EMT,winter.evening,0.0 +2040,6,,GASNAT,peak.night,-0.0 +2040,6,,RSHEAT,peak.night,0.0 +2040,6,,CO2EMT,peak.night,0.0 +2040,6,,GASNAT,peak.day,-0.0 +2040,6,,RSHEAT,peak.day,0.0 +2040,6,,CO2EMT,peak.day,0.0 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,RSHEAT,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 +2040,6,,GASNAT,peak.evening,-0.0 +2040,6,,RSHEAT,peak.evening,0.0 +2040,6,,CO2EMT,peak.evening,0.0 2040,6,,GASNAT,summer.night,-0.0 2040,6,,RSHEAT,summer.night,0.0 2040,6,,CO2EMT,summer.night,0.0 @@ -643,34 +643,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,summer.evening,-0.0 2040,6,,RSHEAT,summer.evening,0.0 2040,6,,CO2EMT,summer.evening,0.0 -2040,6,,GASNAT,autumn.night,-29.838533129172095 -2040,6,,RSHEAT,autumn.night,25.94655054710617 -2040,6,,CO2EMT,autumn.night,1525.6441988945694 -2040,6,,GASNAT,autumn.day,-42.62647584035811 -2040,6,,RSHEAT,autumn.day,37.066500730746185 -2040,6,,CO2EMT,autumn.day,2179.4917097175103 -2040,6,,GASNAT,autumn.peak,-12.787942711186016 -2040,6,,RSHEAT,autumn.peak,11.119950183640015 -2040,6,,CO2EMT,autumn.peak,653.8475108229411 -2040,6,,GASNAT,autumn.evening,-17.050590417986076 -2040,6,,RSHEAT,autumn.evening,14.826600363466154 -2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,6,,GASNAT,autumn.night,-0.0 +2040,6,,RSHEAT,autumn.night,0.0 +2040,6,,CO2EMT,autumn.night,0.0 +2040,6,,GASNAT,autumn.day,-0.0 +2040,6,,RSHEAT,autumn.day,0.0 +2040,6,,CO2EMT,autumn.day,0.0 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 +2040,6,,GASNAT,autumn.evening,-0.0 +2040,6,,RSHEAT,autumn.evening,0.0 +2040,6,,CO2EMT,autumn.evening,0.0 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,ELCTRI,winter.night,-2.71398300195538 2040,9,,RSHEAT,winter.night,8.224190915016303 2040,9,,ELCTRI,winter.day,-3.8771185689047805 @@ -703,30 +703,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,9,,RSHEAT,autumn.peak,3.5246532331800005 2040,9,,ELCTRI,autumn.evening,-1.5508474350059795 2040,9,,RSHEAT,autumn.evening,4.6995376818363015 -2040,10,,GASNAT,winter.night,-45.62106563892816 -2040,10,,RSHEAT,winter.night,39.670491859937535 -2040,10,,CO2EMT,winter.night,2332.605086118397 -2040,10,,GASNAT,winter.day,-237.06042122445515 -2040,10,,RSHEAT,winter.day,206.13949671691753 -2040,10,,CO2EMT,winter.day,12120.899337206392 +2040,10,,GASNAT,winter.night,-75.45959876810025 +2040,10,,RSHEAT,winter.night,65.6170424070437 +2040,10,,CO2EMT,winter.night,3858.249285012966 +2040,10,,GASNAT,winter.day,-279.68689706481325 +2040,10,,RSHEAT,winter.day,243.20599744766372 +2040,10,,CO2EMT,winter.day,14300.391046923904 2040,10,,GASNAT,winter.peak,-127.32947236525759 2040,10,,RSHEAT,winter.peak,110.7212803176153 2040,10,,CO2EMT,winter.peak,6510.355922035621 -2040,10,,GASNAT,winter.evening,-76.97045100924117 -2040,10,,RSHEAT,winter.evening,66.93082696455755 -2040,10,,CO2EMT,winter.evening,3935.499160102502 -2040,10,,GASNAT,peak.night,-20.19030718359216 -2040,10,,RSHEAT,peak.night,17.556788855297533 -2040,10,,CO2EMT,peak.night,1032.3304062970674 -2040,10,,GASNAT,peak.day,-102.01801896162715 -2040,10,,RSHEAT,peak.day,88.71132083619753 -2040,10,,CO2EMT,peak.day,5216.181309507997 -2040,10,,GASNAT,peak.peak,-71.49541567696298 -2040,10,,RSHEAT,peak.peak,62.16992667561999 -2040,10,,CO2EMT,peak.peak,3655.5606035631176 -2040,10,,GASNAT,peak.evening,-31.134620747525183 -2040,10,,RSHEAT,peak.evening,27.07358325871755 -2040,10,,CO2EMT,peak.evening,1591.9131588209627 +2040,10,,GASNAT,winter.evening,-94.02104142722726 +2040,10,,RSHEAT,winter.evening,81.75742732802371 +2040,10,,CO2EMT,winter.evening,4807.295848174131 +2040,10,,GASNAT,peak.night,-50.02884031276425 +2040,10,,RSHEAT,peak.night,43.503339402403704 +2040,10,,CO2EMT,peak.night,2557.974605191637 +2040,10,,GASNAT,peak.day,-144.64449480198527 +2040,10,,RSHEAT,peak.day,125.77782156694371 +2040,10,,CO2EMT,peak.day,7395.673019225507 +2040,10,,GASNAT,peak.peak,-84.283358388149 +2040,10,,RSHEAT,peak.peak,73.28987685926 +2040,10,,CO2EMT,peak.peak,4309.4081143860585 +2040,10,,GASNAT,peak.evening,-48.185211165511255 +2040,10,,RSHEAT,peak.evening,41.900183622183704 +2040,10,,CO2EMT,peak.evening,2463.7098468925906 2040,10,,GASNAT,summer.night,-0.0 2040,10,,RSHEAT,summer.night,0.0 2040,10,,CO2EMT,summer.night,0.0 @@ -739,15 +739,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,10,,GASNAT,summer.evening,-0.0 2040,10,,RSHEAT,summer.evening,0.0 2040,10,,CO2EMT,summer.evening,0.0 -2040,10,,GASNAT,autumn.night,-9.02249651780516 -2040,10,,RSHEAT,autumn.night,7.845649145917532 -2040,10,,CO2EMT,autumn.night,461.32024695537797 -2040,10,,GASNAT,autumn.day,-71.03085431091114 -2040,10,,RSHEAT,autumn.day,61.76596027035752 -2040,10,,CO2EMT,autumn.day,3631.8075809168868 -2040,10,,GASNAT,autumn.peak,-53.81798527175999 -2040,10,,RSHEAT,autumn.peak,46.79824806239999 -2040,10,,CO2EMT,autumn.peak,2751.7135869450885 -2040,10,,GASNAT,autumn.evening,-19.838341184908174 -2040,10,,RSHEAT,autumn.evening,17.250731465137545 -2040,10,,CO2EMT,autumn.evening,1014.334384784355 +2040,10,,GASNAT,autumn.night,-38.86102964697726 +2040,10,,RSHEAT,autumn.night,33.792199693023704 +2040,10,,CO2EMT,autumn.night,1986.9644458499474 +2040,10,,GASNAT,autumn.day,-113.65733015126926 +2040,10,,RSHEAT,autumn.day,98.83246100110371 +2040,10,,CO2EMT,autumn.day,5811.299290634398 +2040,10,,GASNAT,autumn.peak,-66.605927982946 +2040,10,,RSHEAT,autumn.peak,57.918198246040006 +2040,10,,CO2EMT,autumn.peak,3405.5610977680294 +2040,10,,GASNAT,autumn.evening,-36.888931602894246 +2040,10,,RSHEAT,autumn.evening,32.0773318286037 +2040,10,,CO2EMT,autumn.evening,1886.1310728559831 diff --git a/tests/data/simple_marginal/commodity_prices.csv b/tests/data/simple_marginal/commodity_prices.csv index f596979bf..8c1541877 100644 --- a/tests/data/simple_marginal/commodity_prices.csv +++ b/tests/data/simple_marginal/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -175,19 +175,19 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,ELCTRI,GBR,autumn.day,0.4 2040,ELCTRI,GBR,autumn.peak,0.4 2040,ELCTRI,GBR,autumn.evening,0.4000000000000001 -2040,RSHEAT,GBR,winter.night,42.87597234697662 -2040,RSHEAT,GBR,winter.day,51.298584936253235 -2040,RSHEAT,GBR,winter.peak,53.61657450275538 -2040,RSHEAT,GBR,winter.evening,50.23117266981126 -2040,RSHEAT,GBR,peak.night,36.734062499611674 -2040,RSHEAT,GBR,peak.day,46.222992433271436 -2040,RSHEAT,GBR,peak.peak,51.3239733103876 -2040,RSHEAT,GBR,peak.evening,44.233972283889265 +2040,RSHEAT,GBR,winter.night,43.99424149070715 +2040,RSHEAT,GBR,winter.day,45.481477061170416 +2040,RSHEAT,GBR,winter.peak,68.56003719952783 +2040,RSHEAT,GBR,winter.evening,45.29299712407554 +2040,RSHEAT,GBR,peak.night,42.909724460064 +2040,RSHEAT,GBR,peak.day,44.58524663010181 +2040,RSHEAT,GBR,peak.peak,45.48596005177322 +2040,RSHEAT,GBR,peak.evening,44.23403238568843 2040,RSHEAT,GBR,summer.night,23.75379373925692 2040,RSHEAT,GBR,summer.day,23.753793739256917 2040,RSHEAT,GBR,summer.peak,23.753793739256917 2040,RSHEAT,GBR,summer.evening,23.753793739256917 -2040,RSHEAT,GBR,autumn.night,31.993909421254134 -2040,RSHEAT,GBR,autumn.day,43.53777174710168 -2040,RSHEAT,GBR,autumn.peak,49.84318690550902 -2040,RSHEAT,GBR,autumn.evening,40.75937787266201 +2040,RSHEAT,GBR,autumn.night,42.07272475328065 +2040,RSHEAT,GBR,autumn.day,44.11109972180166 +2040,RSHEAT,GBR,autumn.peak,45.22448795030227 +2040,RSHEAT,GBR,autumn.evening,43.62050061671105 diff --git a/tests/data/simple_marginal_average/commodity_flows.csv b/tests/data/simple_marginal_average/commodity_flows.csv index 848337bca..e0427fc83 100644 --- a/tests/data/simple_marginal_average/commodity_flows.csv +++ b/tests/data/simple_marginal_average/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,46 +591,46 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 -2040,6,,GASNAT,winter.night,-29.838533129172095 -2040,6,,RSHEAT,winter.night,25.94655054710617 -2040,6,,CO2EMT,winter.night,1525.6441988945694 -2040,6,,GASNAT,winter.day,-42.62647584035811 -2040,6,,RSHEAT,winter.day,37.066500730746185 -2040,6,,CO2EMT,winter.day,2179.4917097175103 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 +2040,6,,GASNAT,winter.night,-0.0 +2040,6,,RSHEAT,winter.night,0.0 +2040,6,,CO2EMT,winter.night,0.0 +2040,6,,GASNAT,winter.day,-0.0 +2040,6,,RSHEAT,winter.day,0.0 +2040,6,,CO2EMT,winter.day,0.0 2040,6,,GASNAT,winter.peak,-12.786113347771423 2040,6,,RSHEAT,winter.peak,11.118359432844716 2040,6,,CO2EMT,winter.peak,653.753975471553 -2040,6,,GASNAT,winter.evening,-17.050590417986076 -2040,6,,RSHEAT,winter.evening,14.826600363466154 -2040,6,,CO2EMT,winter.evening,871.7966880716282 -2040,6,,GASNAT,peak.night,-29.838533129172095 -2040,6,,RSHEAT,peak.night,25.94655054710617 -2040,6,,CO2EMT,peak.night,1525.6441988945694 -2040,6,,GASNAT,peak.day,-42.62647584035811 -2040,6,,RSHEAT,peak.day,37.066500730746185 -2040,6,,CO2EMT,peak.day,2179.4917097175103 -2040,6,,GASNAT,peak.peak,-12.787942711186016 -2040,6,,RSHEAT,peak.peak,11.119950183640015 -2040,6,,CO2EMT,peak.peak,653.8475108229411 -2040,6,,GASNAT,peak.evening,-17.050590417986076 -2040,6,,RSHEAT,peak.evening,14.826600363466154 -2040,6,,CO2EMT,peak.evening,871.7966880716282 +2040,6,,GASNAT,winter.evening,-0.0 +2040,6,,RSHEAT,winter.evening,0.0 +2040,6,,CO2EMT,winter.evening,0.0 +2040,6,,GASNAT,peak.night,-0.0 +2040,6,,RSHEAT,peak.night,0.0 +2040,6,,CO2EMT,peak.night,0.0 +2040,6,,GASNAT,peak.day,-0.0 +2040,6,,RSHEAT,peak.day,0.0 +2040,6,,CO2EMT,peak.day,0.0 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,RSHEAT,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 +2040,6,,GASNAT,peak.evening,-0.0 +2040,6,,RSHEAT,peak.evening,0.0 +2040,6,,CO2EMT,peak.evening,0.0 2040,6,,GASNAT,summer.night,-0.0 2040,6,,RSHEAT,summer.night,0.0 2040,6,,CO2EMT,summer.night,0.0 @@ -643,34 +643,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,summer.evening,-0.0 2040,6,,RSHEAT,summer.evening,0.0 2040,6,,CO2EMT,summer.evening,0.0 -2040,6,,GASNAT,autumn.night,-29.838533129172095 -2040,6,,RSHEAT,autumn.night,25.94655054710617 -2040,6,,CO2EMT,autumn.night,1525.6441988945694 -2040,6,,GASNAT,autumn.day,-42.62647584035811 -2040,6,,RSHEAT,autumn.day,37.066500730746185 -2040,6,,CO2EMT,autumn.day,2179.4917097175103 -2040,6,,GASNAT,autumn.peak,-12.787942711186016 -2040,6,,RSHEAT,autumn.peak,11.119950183640015 -2040,6,,CO2EMT,autumn.peak,653.8475108229411 -2040,6,,GASNAT,autumn.evening,-17.050590417986076 -2040,6,,RSHEAT,autumn.evening,14.826600363466154 -2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,6,,GASNAT,autumn.night,-0.0 +2040,6,,RSHEAT,autumn.night,0.0 +2040,6,,CO2EMT,autumn.night,0.0 +2040,6,,GASNAT,autumn.day,-0.0 +2040,6,,RSHEAT,autumn.day,0.0 +2040,6,,CO2EMT,autumn.day,0.0 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 +2040,6,,GASNAT,autumn.evening,-0.0 +2040,6,,RSHEAT,autumn.evening,0.0 +2040,6,,CO2EMT,autumn.evening,0.0 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,ELCTRI,winter.night,-2.71398300195538 2040,9,,RSHEAT,winter.night,8.224190915016303 2040,9,,ELCTRI,winter.day,-3.8771185689047805 @@ -703,30 +703,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,9,,RSHEAT,autumn.peak,3.5246532331800005 2040,9,,ELCTRI,autumn.evening,-1.5508474350059795 2040,9,,RSHEAT,autumn.evening,4.6995376818363015 -2040,10,,GASNAT,winter.night,-45.62106563892816 -2040,10,,RSHEAT,winter.night,39.670491859937535 -2040,10,,CO2EMT,winter.night,2332.605086118397 -2040,10,,GASNAT,winter.day,-237.06042122445515 -2040,10,,RSHEAT,winter.day,206.13949671691753 -2040,10,,CO2EMT,winter.day,12120.899337206392 +2040,10,,GASNAT,winter.night,-75.45959876810025 +2040,10,,RSHEAT,winter.night,65.6170424070437 +2040,10,,CO2EMT,winter.night,3858.249285012966 +2040,10,,GASNAT,winter.day,-279.68689706481325 +2040,10,,RSHEAT,winter.day,243.20599744766372 +2040,10,,CO2EMT,winter.day,14300.391046923904 2040,10,,GASNAT,winter.peak,-127.32947236525759 2040,10,,RSHEAT,winter.peak,110.7212803176153 2040,10,,CO2EMT,winter.peak,6510.355922035621 -2040,10,,GASNAT,winter.evening,-76.97045100924117 -2040,10,,RSHEAT,winter.evening,66.93082696455755 -2040,10,,CO2EMT,winter.evening,3935.499160102502 -2040,10,,GASNAT,peak.night,-20.19030718359216 -2040,10,,RSHEAT,peak.night,17.556788855297533 -2040,10,,CO2EMT,peak.night,1032.3304062970674 -2040,10,,GASNAT,peak.day,-102.01801896162715 -2040,10,,RSHEAT,peak.day,88.71132083619753 -2040,10,,CO2EMT,peak.day,5216.181309507997 -2040,10,,GASNAT,peak.peak,-71.49541567696298 -2040,10,,RSHEAT,peak.peak,62.16992667561999 -2040,10,,CO2EMT,peak.peak,3655.5606035631176 -2040,10,,GASNAT,peak.evening,-31.134620747525183 -2040,10,,RSHEAT,peak.evening,27.07358325871755 -2040,10,,CO2EMT,peak.evening,1591.9131588209627 +2040,10,,GASNAT,winter.evening,-94.02104142722726 +2040,10,,RSHEAT,winter.evening,81.75742732802371 +2040,10,,CO2EMT,winter.evening,4807.295848174131 +2040,10,,GASNAT,peak.night,-50.02884031276425 +2040,10,,RSHEAT,peak.night,43.503339402403704 +2040,10,,CO2EMT,peak.night,2557.974605191637 +2040,10,,GASNAT,peak.day,-144.64449480198527 +2040,10,,RSHEAT,peak.day,125.77782156694371 +2040,10,,CO2EMT,peak.day,7395.673019225507 +2040,10,,GASNAT,peak.peak,-84.283358388149 +2040,10,,RSHEAT,peak.peak,73.28987685926 +2040,10,,CO2EMT,peak.peak,4309.4081143860585 +2040,10,,GASNAT,peak.evening,-48.185211165511255 +2040,10,,RSHEAT,peak.evening,41.900183622183704 +2040,10,,CO2EMT,peak.evening,2463.7098468925906 2040,10,,GASNAT,summer.night,-0.0 2040,10,,RSHEAT,summer.night,0.0 2040,10,,CO2EMT,summer.night,0.0 @@ -739,15 +739,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,10,,GASNAT,summer.evening,-0.0 2040,10,,RSHEAT,summer.evening,0.0 2040,10,,CO2EMT,summer.evening,0.0 -2040,10,,GASNAT,autumn.night,-9.02249651780516 -2040,10,,RSHEAT,autumn.night,7.845649145917532 -2040,10,,CO2EMT,autumn.night,461.32024695537797 -2040,10,,GASNAT,autumn.day,-71.03085431091114 -2040,10,,RSHEAT,autumn.day,61.76596027035752 -2040,10,,CO2EMT,autumn.day,3631.8075809168868 -2040,10,,GASNAT,autumn.peak,-53.81798527175999 -2040,10,,RSHEAT,autumn.peak,46.79824806239999 -2040,10,,CO2EMT,autumn.peak,2751.7135869450885 -2040,10,,GASNAT,autumn.evening,-19.838341184908174 -2040,10,,RSHEAT,autumn.evening,17.250731465137545 -2040,10,,CO2EMT,autumn.evening,1014.334384784355 +2040,10,,GASNAT,autumn.night,-38.86102964697726 +2040,10,,RSHEAT,autumn.night,33.792199693023704 +2040,10,,CO2EMT,autumn.night,1986.9644458499474 +2040,10,,GASNAT,autumn.day,-113.65733015126926 +2040,10,,RSHEAT,autumn.day,98.83246100110371 +2040,10,,CO2EMT,autumn.day,5811.299290634398 +2040,10,,GASNAT,autumn.peak,-66.605927982946 +2040,10,,RSHEAT,autumn.peak,57.918198246040006 +2040,10,,CO2EMT,autumn.peak,3405.5610977680294 +2040,10,,GASNAT,autumn.evening,-36.888931602894246 +2040,10,,RSHEAT,autumn.evening,32.0773318286037 +2040,10,,CO2EMT,autumn.evening,1886.1310728559831 diff --git a/tests/data/simple_marginal_average/commodity_prices.csv b/tests/data/simple_marginal_average/commodity_prices.csv index b6254b583..78cf7ddc5 100644 --- a/tests/data/simple_marginal_average/commodity_prices.csv +++ b/tests/data/simple_marginal_average/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -175,19 +175,19 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,ELCTRI,GBR,autumn.day,0.4 2040,ELCTRI,GBR,autumn.peak,0.4 2040,ELCTRI,GBR,autumn.evening,0.4000000000000001 -2040,RSHEAT,GBR,winter.night,42.87597234697662 -2040,RSHEAT,GBR,winter.day,51.298584936253235 -2040,RSHEAT,GBR,winter.peak,53.61657450275538 -2040,RSHEAT,GBR,winter.evening,50.23117266981126 -2040,RSHEAT,GBR,peak.night,36.734062499611674 -2040,RSHEAT,GBR,peak.day,46.222992433271436 -2040,RSHEAT,GBR,peak.peak,51.3239733103876 -2040,RSHEAT,GBR,peak.evening,44.233972283889265 +2040,RSHEAT,GBR,winter.night,43.99424149070715 +2040,RSHEAT,GBR,winter.day,45.481477061170416 +2040,RSHEAT,GBR,winter.peak,68.56003719952783 +2040,RSHEAT,GBR,winter.evening,45.29299712407554 +2040,RSHEAT,GBR,peak.night,42.909724460064 +2040,RSHEAT,GBR,peak.day,44.58524663010181 +2040,RSHEAT,GBR,peak.peak,45.48596005177322 +2040,RSHEAT,GBR,peak.evening,44.23403238568843 2040,RSHEAT,GBR,summer.night,23.75379373925692 2040,RSHEAT,GBR,summer.day,23.753793739256917 2040,RSHEAT,GBR,summer.peak,23.753793739256917 2040,RSHEAT,GBR,summer.evening,23.753793739256917 -2040,RSHEAT,GBR,autumn.night,31.993909421254134 -2040,RSHEAT,GBR,autumn.day,43.53777174710168 -2040,RSHEAT,GBR,autumn.peak,49.84318690550902 -2040,RSHEAT,GBR,autumn.evening,40.75937787266201 +2040,RSHEAT,GBR,autumn.night,42.07272475328065 +2040,RSHEAT,GBR,autumn.day,44.11109972180166 +2040,RSHEAT,GBR,autumn.peak,45.22448795030227 +2040,RSHEAT,GBR,autumn.evening,43.62050061671105 diff --git a/tests/data/simple_npv/commodity_flows.csv b/tests/data/simple_npv/commodity_flows.csv index f3bdf1820..61bf1dc58 100644 --- a/tests/data/simple_npv/commodity_flows.csv +++ b/tests/data/simple_npv/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,31 +591,31 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 2040,6,,GASNAT,winter.night,-29.838533129172095 2040,6,,RSHEAT,winter.night,25.94655054710617 2040,6,,CO2EMT,winter.night,1525.6441988945694 2040,6,,GASNAT,winter.day,-42.62647584035811 2040,6,,RSHEAT,winter.day,37.066500730746185 2040,6,,CO2EMT,winter.day,2179.4917097175103 -2040,6,,GASNAT,winter.peak,-12.786113347771419 -2040,6,,RSHEAT,winter.peak,11.118359432844713 -2040,6,,CO2EMT,winter.peak,653.7539754715527 +2040,6,,GASNAT,winter.peak,-12.787942711186016 +2040,6,,RSHEAT,winter.peak,11.119950183640015 +2040,6,,CO2EMT,winter.peak,653.8475108229411 2040,6,,GASNAT,winter.evening,-17.050590417986076 2040,6,,RSHEAT,winter.evening,14.826600363466154 2040,6,,CO2EMT,winter.evening,871.7966880716282 @@ -655,31 +655,31 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,autumn.evening,-17.050590417986076 2040,6,,RSHEAT,autumn.evening,14.826600363466154 2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,GASNAT,winter.night,-45.62106563892816 2040,9,,RSHEAT,winter.night,39.670491859937535 2040,9,,CO2EMT,winter.night,2332.605086118397 2040,9,,GASNAT,winter.day,-237.06042122445515 2040,9,,RSHEAT,winter.day,206.13949671691753 2040,9,,CO2EMT,winter.day,12120.899337206392 -2040,9,,GASNAT,winter.peak,-127.32947236525759 -2040,9,,RSHEAT,winter.peak,110.7212803176153 -2040,9,,CO2EMT,winter.peak,6510.355922035621 +2040,9,,GASNAT,winter.peak,-127.32764300184299 +2040,9,,RSHEAT,winter.peak,110.71968956682 +2040,9,,CO2EMT,winter.peak,6510.262386684232 2040,9,,GASNAT,winter.evening,-76.97045100924117 2040,9,,RSHEAT,winter.evening,66.93082696455755 2040,9,,CO2EMT,winter.evening,3935.499160102502 diff --git a/tests/data/simple_npv/commodity_prices.csv b/tests/data/simple_npv/commodity_prices.csv index af18ca08c..863f17973 100644 --- a/tests/data/simple_npv/commodity_prices.csv +++ b/tests/data/simple_npv/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -159,35 +159,35 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASNAT,GBR,autumn.day,10.866957996006988 2040,GASNAT,GBR,autumn.peak,10.866957996006988 2040,GASNAT,GBR,autumn.evening,10.866957996006988 -2040,ELCTRI,GBR,winter.night,18.40751185337733 -2040,ELCTRI,GBR,winter.day,18.40751185337733 -2040,ELCTRI,GBR,winter.peak,18.40751185337733 -2040,ELCTRI,GBR,winter.evening,18.40751185337733 -2040,ELCTRI,GBR,peak.night,18.40751185337733 -2040,ELCTRI,GBR,peak.day,18.40751185337733 -2040,ELCTRI,GBR,peak.peak,18.40751185337733 -2040,ELCTRI,GBR,peak.evening,18.40751185337733 -2040,ELCTRI,GBR,summer.night,278.4706392854486 -2040,ELCTRI,GBR,summer.day,18.40751185337733 -2040,ELCTRI,GBR,summer.peak,18.40751185337733 -2040,ELCTRI,GBR,summer.evening,18.40751185337733 -2040,ELCTRI,GBR,autumn.night,18.40751185337733 -2040,ELCTRI,GBR,autumn.day,18.40751185337733 -2040,ELCTRI,GBR,autumn.peak,18.40751185337733 -2040,ELCTRI,GBR,autumn.evening,18.40751185337733 -2040,RSHEAT,GBR,winter.night,43.53782587892427 -2040,RSHEAT,GBR,winter.day,51.57242660228903 -2040,RSHEAT,GBR,winter.peak,53.783649010260156 -2040,RSHEAT,GBR,winter.evening,50.55418775096134 -2040,RSHEAT,GBR,peak.night,37.67886076810967 -2040,RSHEAT,GBR,peak.day,46.73065586147608 -2040,RSHEAT,GBR,peak.peak,51.59664538797137 -2040,RSHEAT,GBR,peak.evening,44.83326564417468 -2040,RSHEAT,GBR,summer.night,115.51710470345496 -2040,RSHEAT,GBR,summer.day,29.696272650871435 -2040,RSHEAT,GBR,summer.peak,29.696272650871432 -2040,RSHEAT,GBR,summer.evening,29.696272650871435 -2040,RSHEAT,GBR,autumn.night,33.15707647035864 -2040,RSHEAT,GBR,autumn.day,44.16913758685406 -2040,RSHEAT,GBR,autumn.peak,50.18407566644177 -2040,RSHEAT,GBR,autumn.evening,41.51873841477455 +2040,ELCTRI,GBR,winter.night,17.314767437204573 +2040,ELCTRI,GBR,winter.day,17.314767437204573 +2040,ELCTRI,GBR,winter.peak,17.314767437204573 +2040,ELCTRI,GBR,winter.evening,17.314767437204573 +2040,ELCTRI,GBR,peak.night,17.314767437204573 +2040,ELCTRI,GBR,peak.day,17.314767437204573 +2040,ELCTRI,GBR,peak.peak,17.314767437204573 +2040,ELCTRI,GBR,peak.evening,17.314767437204573 +2040,ELCTRI,GBR,summer.night,207.7596152550184 +2040,ELCTRI,GBR,summer.day,17.314767437204573 +2040,ELCTRI,GBR,summer.peak,17.314767437204573 +2040,ELCTRI,GBR,summer.evening,232.6474400224208 +2040,ELCTRI,GBR,autumn.night,17.314767437204573 +2040,ELCTRI,GBR,autumn.day,17.314767437204573 +2040,ELCTRI,GBR,autumn.peak,17.314767437204573 +2040,ELCTRI,GBR,autumn.evening,17.314767437204573 +2040,RSHEAT,GBR,winter.night,43.49768572328828 +2040,RSHEAT,GBR,winter.day,51.55587095855007 +2040,RSHEAT,GBR,winter.peak,53.773198870580835 +2040,RSHEAT,GBR,winter.evening,50.5346432012232 +2040,RSHEAT,GBR,peak.night,37.62152239228601 +2040,RSHEAT,GBR,peak.day,46.699887837611335 +2040,RSHEAT,GBR,peak.peak,51.58016083528705 +2040,RSHEAT,GBR,peak.evening,44.796928081300585 +2040,RSHEAT,GBR,summer.night,92.182466773413 +2040,RSHEAT,GBR,summer.day,29.335666993534428 +2040,RSHEAT,GBR,summer.peak,29.335666993534428 +2040,RSHEAT,GBR,summer.evening,100.39544894665578 +2040,RSHEAT,GBR,autumn.night,33.086464992455866 +2040,RSHEAT,GBR,autumn.day,44.13085056356392 +2040,RSHEAT,GBR,autumn.peak,50.163444701440305 +2040,RSHEAT,GBR,autumn.evening,41.47267149389421 diff --git a/tests/data/simple_shadow/commodity_flows.csv b/tests/data/simple_shadow/commodity_flows.csv index 848337bca..e0427fc83 100644 --- a/tests/data/simple_shadow/commodity_flows.csv +++ b/tests/data/simple_shadow/commodity_flows.csv @@ -513,8 +513,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2030,8,,CO2EMT,autumn.evening,31.79189578461804 2040,0,,GASPRD,winter.night,0.0 2040,0,,CO2EMT,winter.night,0.0 -2040,0,,GASPRD,winter.day,326.9158194544082 -2040,0,,CO2EMT,winter.day,1671.5205848703895 +2040,0,,GASPRD,winter.day,326.91581945440834 +2040,0,,CO2EMT,winter.day,1671.52058487039 2040,0,,GASPRD,winter.peak,125.070625 2040,0,,CO2EMT,winter.peak,639.486105625 2040,0,,GASPRD,winter.evening,166.76083466742 @@ -533,8 +533,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,summer.day,0.0 2040,0,,GASPRD,summer.peak,0.0 2040,0,,CO2EMT,summer.peak,0.0 -2040,0,,GASPRD,summer.evening,0.0 -2040,0,,CO2EMT,summer.evening,0.0 +2040,0,,GASPRD,summer.evening,-0.0 +2040,0,,CO2EMT,summer.evening,-0.0 2040,0,,GASPRD,autumn.night,0.0 2040,0,,CO2EMT,autumn.night,0.0 2040,0,,GASPRD,autumn.day,0.0 @@ -543,18 +543,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,0,,CO2EMT,autumn.peak,521.7972225918589 2040,0,,GASPRD,autumn.evening,166.76083466742 2040,0,,CO2EMT,autumn.evening,852.6481476545185 -2040,1,,GASPRD,winter.night,-0.0 -2040,1,,GASNAT,winter.night,0.0 -2040,1,,CO2EMT,winter.night,0.0 +2040,1,,GASPRD,winter.night,-289.5693294487456 +2040,1,,GASNAT,winter.night,275.78031376071004 +2040,1,,CO2EMT,winter.night,705.0323721292552 2040,1,,GASPRD,winter.day,-329.17794967308276 2040,1,,GASNAT,winter.day,313.50280921245974 2040,1,,CO2EMT,winter.day,801.4699317516533 -2040,1,,GASPRD,winter.peak,-124.10114062500001 -2040,1,,GASNAT,winter.peak,118.1915625 -2040,1,,CO2EMT,winter.peak,302.15672953125005 -2040,1,,GASPRD,winter.evening,-165.4681888237455 -2040,1,,GASNAT,winter.evening,157.58875126070998 -2040,1,,CO2EMT,winter.evening,402.87564259800513 +2040,1,,GASPRD,winter.peak,-0.0 +2040,1,,GASNAT,winter.peak,0.0 +2040,1,,CO2EMT,winter.peak,0.0 +2040,1,,GASPRD,winter.evening,-0.0 +2040,1,,GASNAT,winter.evening,0.0 +2040,1,,CO2EMT,winter.evening,0.0 2040,1,,GASPRD,peak.night,-0.0 2040,1,,GASNAT,peak.night,0.0 2040,1,,CO2EMT,peak.night,0.0 @@ -576,9 +576,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,summer.peak,-0.0 2040,1,,GASNAT,summer.peak,0.0 2040,1,,CO2EMT,summer.peak,0.0 -2040,1,,GASPRD,summer.evening,-0.0 -2040,1,,GASNAT,summer.evening,0.0 -2040,1,,CO2EMT,summer.evening,0.0 +2040,1,,GASPRD,summer.evening,0.0 +2040,1,,GASNAT,summer.evening,-0.0 +2040,1,,CO2EMT,summer.evening,-0.0 2040,1,,GASPRD,autumn.night,-0.0 2040,1,,GASNAT,autumn.night,0.0 2040,1,,CO2EMT,autumn.night,0.0 @@ -591,46 +591,46 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,1,,GASPRD,autumn.evening,-165.4681888237455 2040,1,,GASNAT,autumn.evening,157.58875126070998 2040,1,,CO2EMT,autumn.evening,402.87564259800513 -2040,2,,ELCTRI,winter.night,0.0 -2040,2,,ELCTRI,winter.day,0.0 -2040,2,,ELCTRI,winter.peak,0.0 -2040,2,,ELCTRI,winter.evening,0.0 -2040,2,,ELCTRI,peak.night,0.0 -2040,2,,ELCTRI,peak.day,0.0 -2040,2,,ELCTRI,peak.peak,0.0 -2040,2,,ELCTRI,peak.evening,0.0 +2040,2,,ELCTRI,winter.night,2.71398300195538 +2040,2,,ELCTRI,winter.day,3.8771185689047805 +2040,2,,ELCTRI,winter.peak,1.1631355669494001 +2040,2,,ELCTRI,winter.evening,1.5508474350059795 +2040,2,,ELCTRI,peak.night,2.71398300195538 +2040,2,,ELCTRI,peak.day,3.8771185689047805 +2040,2,,ELCTRI,peak.peak,1.1631355669494001 +2040,2,,ELCTRI,peak.evening,1.5508474350059795 2040,2,,ELCTRI,summer.night,0.24502568706609473 -2040,2,,ELCTRI,summer.day,0.0 -2040,2,,ELCTRI,summer.peak,0.0 +2040,2,,ELCTRI,summer.day,3.5321677056534004 +2040,2,,ELCTRI,summer.peak,1.1631355669494001 2040,2,,ELCTRI,summer.evening,0.0 -2040,2,,ELCTRI,autumn.night,0.0 -2040,2,,ELCTRI,autumn.day,0.0 -2040,2,,ELCTRI,autumn.peak,0.0 -2040,2,,ELCTRI,autumn.evening,0.0 -2040,6,,GASNAT,winter.night,-29.838533129172095 -2040,6,,RSHEAT,winter.night,25.94655054710617 -2040,6,,CO2EMT,winter.night,1525.6441988945694 -2040,6,,GASNAT,winter.day,-42.62647584035811 -2040,6,,RSHEAT,winter.day,37.066500730746185 -2040,6,,CO2EMT,winter.day,2179.4917097175103 +2040,2,,ELCTRI,autumn.night,2.71398300195538 +2040,2,,ELCTRI,autumn.day,3.8771185689047805 +2040,2,,ELCTRI,autumn.peak,1.1631355669494001 +2040,2,,ELCTRI,autumn.evening,1.5508474350059795 +2040,6,,GASNAT,winter.night,-0.0 +2040,6,,RSHEAT,winter.night,0.0 +2040,6,,CO2EMT,winter.night,0.0 +2040,6,,GASNAT,winter.day,-0.0 +2040,6,,RSHEAT,winter.day,0.0 +2040,6,,CO2EMT,winter.day,0.0 2040,6,,GASNAT,winter.peak,-12.786113347771423 2040,6,,RSHEAT,winter.peak,11.118359432844716 2040,6,,CO2EMT,winter.peak,653.753975471553 -2040,6,,GASNAT,winter.evening,-17.050590417986076 -2040,6,,RSHEAT,winter.evening,14.826600363466154 -2040,6,,CO2EMT,winter.evening,871.7966880716282 -2040,6,,GASNAT,peak.night,-29.838533129172095 -2040,6,,RSHEAT,peak.night,25.94655054710617 -2040,6,,CO2EMT,peak.night,1525.6441988945694 -2040,6,,GASNAT,peak.day,-42.62647584035811 -2040,6,,RSHEAT,peak.day,37.066500730746185 -2040,6,,CO2EMT,peak.day,2179.4917097175103 -2040,6,,GASNAT,peak.peak,-12.787942711186016 -2040,6,,RSHEAT,peak.peak,11.119950183640015 -2040,6,,CO2EMT,peak.peak,653.8475108229411 -2040,6,,GASNAT,peak.evening,-17.050590417986076 -2040,6,,RSHEAT,peak.evening,14.826600363466154 -2040,6,,CO2EMT,peak.evening,871.7966880716282 +2040,6,,GASNAT,winter.evening,-0.0 +2040,6,,RSHEAT,winter.evening,0.0 +2040,6,,CO2EMT,winter.evening,0.0 +2040,6,,GASNAT,peak.night,-0.0 +2040,6,,RSHEAT,peak.night,0.0 +2040,6,,CO2EMT,peak.night,0.0 +2040,6,,GASNAT,peak.day,-0.0 +2040,6,,RSHEAT,peak.day,0.0 +2040,6,,CO2EMT,peak.day,0.0 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,RSHEAT,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 +2040,6,,GASNAT,peak.evening,-0.0 +2040,6,,RSHEAT,peak.evening,0.0 +2040,6,,CO2EMT,peak.evening,0.0 2040,6,,GASNAT,summer.night,-0.0 2040,6,,RSHEAT,summer.night,0.0 2040,6,,CO2EMT,summer.night,0.0 @@ -643,34 +643,34 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,summer.evening,-0.0 2040,6,,RSHEAT,summer.evening,0.0 2040,6,,CO2EMT,summer.evening,0.0 -2040,6,,GASNAT,autumn.night,-29.838533129172095 -2040,6,,RSHEAT,autumn.night,25.94655054710617 -2040,6,,CO2EMT,autumn.night,1525.6441988945694 -2040,6,,GASNAT,autumn.day,-42.62647584035811 -2040,6,,RSHEAT,autumn.day,37.066500730746185 -2040,6,,CO2EMT,autumn.day,2179.4917097175103 -2040,6,,GASNAT,autumn.peak,-12.787942711186016 -2040,6,,RSHEAT,autumn.peak,11.119950183640015 -2040,6,,CO2EMT,autumn.peak,653.8475108229411 -2040,6,,GASNAT,autumn.evening,-17.050590417986076 -2040,6,,RSHEAT,autumn.evening,14.826600363466154 -2040,6,,CO2EMT,autumn.evening,871.7966880716282 -2040,7,,ELCTRI,winter.night,2.71398300195538 -2040,7,,ELCTRI,winter.day,3.8771185689047805 -2040,7,,ELCTRI,winter.peak,1.1631355669494001 -2040,7,,ELCTRI,winter.evening,1.5508474350059795 -2040,7,,ELCTRI,peak.night,2.71398300195538 -2040,7,,ELCTRI,peak.day,3.8771185689047805 -2040,7,,ELCTRI,peak.peak,1.1631355669494001 -2040,7,,ELCTRI,peak.evening,1.5508474350059795 +2040,6,,GASNAT,autumn.night,-0.0 +2040,6,,RSHEAT,autumn.night,0.0 +2040,6,,CO2EMT,autumn.night,0.0 +2040,6,,GASNAT,autumn.day,-0.0 +2040,6,,RSHEAT,autumn.day,0.0 +2040,6,,CO2EMT,autumn.day,0.0 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,RSHEAT,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 +2040,6,,GASNAT,autumn.evening,-0.0 +2040,6,,RSHEAT,autumn.evening,0.0 +2040,6,,CO2EMT,autumn.evening,0.0 +2040,7,,ELCTRI,winter.night,0.0 +2040,7,,ELCTRI,winter.day,0.0 +2040,7,,ELCTRI,winter.peak,0.0 +2040,7,,ELCTRI,winter.evening,0.0 +2040,7,,ELCTRI,peak.night,0.0 +2040,7,,ELCTRI,peak.day,0.0 +2040,7,,ELCTRI,peak.peak,0.0 +2040,7,,ELCTRI,peak.evening,0.0 2040,7,,ELCTRI,summer.night,1.8749681870903054 -2040,7,,ELCTRI,summer.day,3.5321677056534004 -2040,7,,ELCTRI,summer.peak,1.1631355669494001 +2040,7,,ELCTRI,summer.day,0.0 +2040,7,,ELCTRI,summer.peak,0.0 2040,7,,ELCTRI,summer.evening,0.8660474423502 -2040,7,,ELCTRI,autumn.night,2.71398300195538 -2040,7,,ELCTRI,autumn.day,3.8771185689047805 -2040,7,,ELCTRI,autumn.peak,1.1631355669494001 -2040,7,,ELCTRI,autumn.evening,1.5508474350059795 +2040,7,,ELCTRI,autumn.night,0.0 +2040,7,,ELCTRI,autumn.day,0.0 +2040,7,,ELCTRI,autumn.peak,0.0 +2040,7,,ELCTRI,autumn.evening,0.0 2040,9,,ELCTRI,winter.night,-2.71398300195538 2040,9,,RSHEAT,winter.night,8.224190915016303 2040,9,,ELCTRI,winter.day,-3.8771185689047805 @@ -703,30 +703,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,9,,RSHEAT,autumn.peak,3.5246532331800005 2040,9,,ELCTRI,autumn.evening,-1.5508474350059795 2040,9,,RSHEAT,autumn.evening,4.6995376818363015 -2040,10,,GASNAT,winter.night,-45.62106563892816 -2040,10,,RSHEAT,winter.night,39.670491859937535 -2040,10,,CO2EMT,winter.night,2332.605086118397 -2040,10,,GASNAT,winter.day,-237.06042122445515 -2040,10,,RSHEAT,winter.day,206.13949671691753 -2040,10,,CO2EMT,winter.day,12120.899337206392 +2040,10,,GASNAT,winter.night,-75.45959876810025 +2040,10,,RSHEAT,winter.night,65.6170424070437 +2040,10,,CO2EMT,winter.night,3858.249285012966 +2040,10,,GASNAT,winter.day,-279.68689706481325 +2040,10,,RSHEAT,winter.day,243.20599744766372 +2040,10,,CO2EMT,winter.day,14300.391046923904 2040,10,,GASNAT,winter.peak,-127.32947236525759 2040,10,,RSHEAT,winter.peak,110.7212803176153 2040,10,,CO2EMT,winter.peak,6510.355922035621 -2040,10,,GASNAT,winter.evening,-76.97045100924117 -2040,10,,RSHEAT,winter.evening,66.93082696455755 -2040,10,,CO2EMT,winter.evening,3935.499160102502 -2040,10,,GASNAT,peak.night,-20.19030718359216 -2040,10,,RSHEAT,peak.night,17.556788855297533 -2040,10,,CO2EMT,peak.night,1032.3304062970674 -2040,10,,GASNAT,peak.day,-102.01801896162715 -2040,10,,RSHEAT,peak.day,88.71132083619753 -2040,10,,CO2EMT,peak.day,5216.181309507997 -2040,10,,GASNAT,peak.peak,-71.49541567696298 -2040,10,,RSHEAT,peak.peak,62.16992667561999 -2040,10,,CO2EMT,peak.peak,3655.5606035631176 -2040,10,,GASNAT,peak.evening,-31.134620747525183 -2040,10,,RSHEAT,peak.evening,27.07358325871755 -2040,10,,CO2EMT,peak.evening,1591.9131588209627 +2040,10,,GASNAT,winter.evening,-94.02104142722726 +2040,10,,RSHEAT,winter.evening,81.75742732802371 +2040,10,,CO2EMT,winter.evening,4807.295848174131 +2040,10,,GASNAT,peak.night,-50.02884031276425 +2040,10,,RSHEAT,peak.night,43.503339402403704 +2040,10,,CO2EMT,peak.night,2557.974605191637 +2040,10,,GASNAT,peak.day,-144.64449480198527 +2040,10,,RSHEAT,peak.day,125.77782156694371 +2040,10,,CO2EMT,peak.day,7395.673019225507 +2040,10,,GASNAT,peak.peak,-84.283358388149 +2040,10,,RSHEAT,peak.peak,73.28987685926 +2040,10,,CO2EMT,peak.peak,4309.4081143860585 +2040,10,,GASNAT,peak.evening,-48.185211165511255 +2040,10,,RSHEAT,peak.evening,41.900183622183704 +2040,10,,CO2EMT,peak.evening,2463.7098468925906 2040,10,,GASNAT,summer.night,-0.0 2040,10,,RSHEAT,summer.night,0.0 2040,10,,CO2EMT,summer.night,0.0 @@ -739,15 +739,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,10,,GASNAT,summer.evening,-0.0 2040,10,,RSHEAT,summer.evening,0.0 2040,10,,CO2EMT,summer.evening,0.0 -2040,10,,GASNAT,autumn.night,-9.02249651780516 -2040,10,,RSHEAT,autumn.night,7.845649145917532 -2040,10,,CO2EMT,autumn.night,461.32024695537797 -2040,10,,GASNAT,autumn.day,-71.03085431091114 -2040,10,,RSHEAT,autumn.day,61.76596027035752 -2040,10,,CO2EMT,autumn.day,3631.8075809168868 -2040,10,,GASNAT,autumn.peak,-53.81798527175999 -2040,10,,RSHEAT,autumn.peak,46.79824806239999 -2040,10,,CO2EMT,autumn.peak,2751.7135869450885 -2040,10,,GASNAT,autumn.evening,-19.838341184908174 -2040,10,,RSHEAT,autumn.evening,17.250731465137545 -2040,10,,CO2EMT,autumn.evening,1014.334384784355 +2040,10,,GASNAT,autumn.night,-38.86102964697726 +2040,10,,RSHEAT,autumn.night,33.792199693023704 +2040,10,,CO2EMT,autumn.night,1986.9644458499474 +2040,10,,GASNAT,autumn.day,-113.65733015126926 +2040,10,,RSHEAT,autumn.day,98.83246100110371 +2040,10,,CO2EMT,autumn.day,5811.299290634398 +2040,10,,GASNAT,autumn.peak,-66.605927982946 +2040,10,,RSHEAT,autumn.peak,57.918198246040006 +2040,10,,CO2EMT,autumn.peak,3405.5610977680294 +2040,10,,GASNAT,autumn.evening,-36.888931602894246 +2040,10,,RSHEAT,autumn.evening,32.0773318286037 +2040,10,,CO2EMT,autumn.evening,1886.1310728559831 diff --git a/tests/data/simple_shadow/commodity_prices.csv b/tests/data/simple_shadow/commodity_prices.csv index 9edcfb4b5..f407e36e0 100644 --- a/tests/data/simple_shadow/commodity_prices.csv +++ b/tests/data/simple_shadow/commodity_prices.csv @@ -143,14 +143,14 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,GASPRD,GBR,autumn.day,6.761479010737171 2040,GASPRD,GBR,autumn.peak,6.761479010737171 2040,GASPRD,GBR,autumn.evening,6.761479010737171 -2040,GASNAT,GBR,winter.night,10.86695799600699 -2040,GASNAT,GBR,winter.day,10.86695799600699 -2040,GASNAT,GBR,winter.peak,10.86695799600699 -2040,GASNAT,GBR,winter.evening,10.86695799600699 -2040,GASNAT,GBR,peak.night,10.86695799600699 -2040,GASNAT,GBR,peak.day,10.86695799600699 -2040,GASNAT,GBR,peak.peak,10.86695799600699 -2040,GASNAT,GBR,peak.evening,10.86695799600699 +2040,GASNAT,GBR,winter.night,10.866957996006992 +2040,GASNAT,GBR,winter.day,10.866957996006992 +2040,GASNAT,GBR,winter.peak,10.866957996006992 +2040,GASNAT,GBR,winter.evening,10.866957996006992 +2040,GASNAT,GBR,peak.night,10.866957996006988 +2040,GASNAT,GBR,peak.day,10.866957996006988 +2040,GASNAT,GBR,peak.peak,10.866957996006988 +2040,GASNAT,GBR,peak.evening,10.866957996006988 2040,GASNAT,GBR,summer.night,10.86695799600699 2040,GASNAT,GBR,summer.day,10.86695799600699 2040,GASNAT,GBR,summer.peak,10.86695799600699 @@ -175,19 +175,19 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,ELCTRI,GBR,autumn.day,0.4 2040,ELCTRI,GBR,autumn.peak,0.4 2040,ELCTRI,GBR,autumn.evening,0.4 -2040,RSHEAT,GBR,winter.night,42.87597234697662 -2040,RSHEAT,GBR,winter.day,51.298584936253235 -2040,RSHEAT,GBR,winter.peak,53.61657450275538 -2040,RSHEAT,GBR,winter.evening,50.23117266981126 -2040,RSHEAT,GBR,peak.night,36.734062499611674 -2040,RSHEAT,GBR,peak.day,46.222992433271436 -2040,RSHEAT,GBR,peak.peak,51.3239733103876 -2040,RSHEAT,GBR,peak.evening,44.233972283889265 +2040,RSHEAT,GBR,winter.night,43.99424149070715 +2040,RSHEAT,GBR,winter.day,45.481477061170416 +2040,RSHEAT,GBR,winter.peak,68.56003719952783 +2040,RSHEAT,GBR,winter.evening,45.29299712407554 +2040,RSHEAT,GBR,peak.night,42.909724460064 +2040,RSHEAT,GBR,peak.day,44.58524663010181 +2040,RSHEAT,GBR,peak.peak,45.48596005177322 +2040,RSHEAT,GBR,peak.evening,44.23403238568843 2040,RSHEAT,GBR,summer.night,23.75379373925692 2040,RSHEAT,GBR,summer.day,23.753793739256917 2040,RSHEAT,GBR,summer.peak,23.753793739256917 2040,RSHEAT,GBR,summer.evening,23.753793739256917 -2040,RSHEAT,GBR,autumn.night,31.993909421254134 -2040,RSHEAT,GBR,autumn.day,43.53777174710168 -2040,RSHEAT,GBR,autumn.peak,49.84318690550902 -2040,RSHEAT,GBR,autumn.evening,40.75937787266201 +2040,RSHEAT,GBR,autumn.night,42.07272475328065 +2040,RSHEAT,GBR,autumn.day,44.11109972180166 +2040,RSHEAT,GBR,autumn.peak,45.22448795030227 +2040,RSHEAT,GBR,autumn.evening,43.62050061671105 diff --git a/tests/data/two_outputs/asset_capacities.csv b/tests/data/two_outputs/asset_capacities.csv index fbaef692a..919f36cb8 100644 --- a/tests/data/two_outputs/asset_capacities.csv +++ b/tests/data/two_outputs/asset_capacities.csv @@ -48,4 +48,4 @@ milestone_year,asset_id,group_id,capacity,num_units 2040,29,,144.81275130376434, 2040,30,,2398.459542867851, 2040,31,,291.76002707306935, -2040,32,,2510.2631073740185, +2040,32,,2510.263107374022, diff --git a/tests/data/two_outputs/commodity_flows.csv b/tests/data/two_outputs/commodity_flows.csv index 5beb87ae6..f5767ab8e 100644 --- a/tests/data/two_outputs/commodity_flows.csv +++ b/tests/data/two_outputs/commodity_flows.csv @@ -1313,9 +1313,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,peak.day,-0.0 2040,6,,ELCTRI,peak.day,0.0 2040,6,,CO2EMT,peak.day,0.0 -2040,6,,GASNAT,peak.peak,-1.055344380172368 -2040,6,,ELCTRI,peak.peak,0.7035629201149121 -2040,6,,CO2EMT,peak.peak,53.95975815821318 +2040,6,,GASNAT,peak.peak,-0.0 +2040,6,,ELCTRI,peak.peak,0.0 +2040,6,,CO2EMT,peak.peak,0.0 2040,6,,GASNAT,peak.evening,-0.0 2040,6,,ELCTRI,peak.evening,0.0 2040,6,,CO2EMT,peak.evening,0.0 @@ -1337,9 +1337,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,6,,GASNAT,autumn.day,-0.0 2040,6,,ELCTRI,autumn.day,0.0 2040,6,,CO2EMT,autumn.day,0.0 -2040,6,,GASNAT,autumn.peak,-2.2388719595590847 -2040,6,,ELCTRI,autumn.peak,1.4925813063727231 -2040,6,,CO2EMT,autumn.peak,114.47352329225599 +2040,6,,GASNAT,autumn.peak,-0.0 +2040,6,,ELCTRI,autumn.peak,0.0 +2040,6,,CO2EMT,autumn.peak,0.0 2040,6,,GASNAT,autumn.evening,-0.0 2040,6,,ELCTRI,autumn.evening,0.0 2040,6,,CO2EMT,autumn.evening,0.0 @@ -1430,12 +1430,12 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,17,,GASNAT,autumn.night,-0.0 2040,17,,ELCTRI,autumn.night,0.0 2040,17,,CO2EMT,autumn.night,0.0 -2040,17,,GASNAT,autumn.day,-1.9944787965014772 -2040,17,,ELCTRI,autumn.day,1.3296525310009848 -2040,17,,CO2EMT,autumn.day,101.97770086512053 -2040,17,,GASNAT,autumn.peak,-0.0 -2040,17,,ELCTRI,autumn.peak,0.0 -2040,17,,CO2EMT,autumn.peak,0.0 +2040,17,,GASNAT,autumn.day,-0.0 +2040,17,,ELCTRI,autumn.day,0.0 +2040,17,,CO2EMT,autumn.day,0.0 +2040,17,,GASNAT,autumn.peak,-2.2388719595590847 +2040,17,,ELCTRI,autumn.peak,1.4925813063727231 +2040,17,,CO2EMT,autumn.peak,114.47352329225599 2040,17,,GASNAT,autumn.evening,-10.781504161703381 2040,17,,ELCTRI,autumn.evening,7.187669441135587 2040,17,,CO2EMT,autumn.evening,551.2583077878938 @@ -1457,9 +1457,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,18,,GASPRD,peak.day,-0.0 2040,18,,GASNAT,peak.day,0.0 2040,18,,CO2EMT,peak.day,0.0 -2040,18,,GASPRD,peak.peak,-4.288476778132384 -2040,18,,GASNAT,peak.peak,4.084263598221318 -2040,18,,CO2EMT,peak.peak,10.4414198888528 +2040,18,,GASPRD,peak.peak,-2.640905665007891 +2040,18,,GASNAT,peak.peak,2.5151482523884674 +2040,18,,CO2EMT,peak.peak,6.4299765072311175 2040,18,,GASPRD,peak.evening,-11.831375718111653 2040,18,,GASNAT,peak.evening,11.26797687439205 2040,18,,CO2EMT,peak.evening,28.806582879383278 @@ -1481,15 +1481,15 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,18,,GASPRD,autumn.day,-0.0 2040,18,,GASNAT,autumn.day,0.0 2040,18,,CO2EMT,autumn.day,0.0 -2040,18,,GASPRD,autumn.peak,-7.490027939716881 -2040,18,,GASNAT,autumn.peak,7.133359942587505 -2040,18,,CO2EMT,autumn.peak,18.236434693224957 +2040,18,,GASPRD,autumn.peak,-5.842456826592386 +2040,18,,GASNAT,autumn.peak,5.564244596754653 +2040,18,,CO2EMT,autumn.peak,14.224991311603272 2040,18,,GASPRD,autumn.evening,-11.831375718111653 2040,18,,GASNAT,autumn.evening,11.26797687439205 2040,18,,CO2EMT,autumn.evening,28.806582879383278 -2040,19,,OILCRD,winter.night,-54.44998413627791 -2040,19,,GASOLI,winter.night,41.56487338647169 -2040,19,,CO2EMT,winter.night,914.4272145023772 +2040,19,,OILCRD,winter.night,-16.36656741869745 +2040,19,,GASOLI,winter.night,12.493562915036222 +2040,19,,CO2EMT,winter.night,274.8583841307969 2040,19,,OILCRD,winter.day,-97.67202148232764 2040,19,,GASOLI,winter.day,74.55879502467758 2040,19,,CO2EMT,winter.day,1640.2934905429067 @@ -1499,9 +1499,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,19,,OILCRD,winter.evening,-39.06880878046133 2040,19,,GASOLI,winter.evening,29.823518153023915 2040,19,,CO2EMT,winter.evening,656.1173993665261 -2040,19,,OILCRD,peak.night,-54.44998413627791 -2040,19,,GASOLI,peak.night,41.56487338647169 -2040,19,,CO2EMT,peak.night,914.4272145023772 +2040,19,,OILCRD,peak.night,-54.44998413627793 +2040,19,,GASOLI,peak.night,41.5648733864717 +2040,19,,CO2EMT,peak.night,914.4272145023774 2040,19,,OILCRD,peak.day,-97.67202148232764 2040,19,,GASOLI,peak.day,74.55879502467758 2040,19,,CO2EMT,peak.day,1640.2934905429067 @@ -1511,9 +1511,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,19,,OILCRD,peak.evening,-39.06880878046133 2040,19,,GASOLI,peak.evening,29.823518153023915 2040,19,,CO2EMT,peak.evening,656.1173993665261 -2040,19,,OILCRD,summer.night,-7.0238078945904 -2040,19,,GASOLI,summer.night,5.361685415717862 -2040,19,,CO2EMT,summer.night,117.95707914579297 +2040,19,,OILCRD,summer.night,-54.44998413627793 +2040,19,,GASOLI,summer.night,41.5648733864717 +2040,19,,CO2EMT,summer.night,914.4272145023774 2040,19,,OILCRD,summer.day,-97.67202148232764 2040,19,,GASOLI,summer.day,74.55879502467758 2040,19,,CO2EMT,summer.day,1640.2934905429067 @@ -1523,9 +1523,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,19,,OILCRD,summer.evening,-39.06880878046133 2040,19,,GASOLI,summer.evening,29.823518153023915 2040,19,,CO2EMT,summer.evening,656.1173993665261 -2040,19,,OILCRD,autumn.night,-54.44998413627791 -2040,19,,GASOLI,autumn.night,41.56487338647169 -2040,19,,CO2EMT,autumn.night,914.4272145023772 +2040,19,,OILCRD,autumn.night,-54.44998413627793 +2040,19,,GASOLI,autumn.night,41.5648733864717 +2040,19,,CO2EMT,autumn.night,914.4272145023774 2040,19,,OILCRD,autumn.day,-97.67202148232764 2040,19,,GASOLI,autumn.day,74.55879502467758 2040,19,,CO2EMT,autumn.day,1640.2934905429067 @@ -1551,14 +1551,14 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,21,,BIOPEL,peak.peak,3.542898763374408 2040,21,,BIOPRD,peak.evening,-4.960058308404636 2040,21,,BIOPEL,peak.evening,4.723865055623463 -2040,21,,BIOPRD,summer.night,-0.15400046292734404 -2040,21,,BIOPEL,summer.night,0.14666710754985146 -2040,21,,BIOPRD,summer.day,-12.400145711490895 -2040,21,,BIOPEL,summer.day,11.80966258237228 -2040,21,,BIOPRD,summer.peak,-3.7200437015431285 -2040,21,,BIOPEL,summer.peak,3.542898763374408 -2040,21,,BIOPRD,summer.evening,-4.960058308404636 -2040,21,,BIOPEL,summer.evening,4.723865055623463 +2040,21,,BIOPRD,summer.night,-0.0 +2040,21,,BIOPEL,summer.night,0.0 +2040,21,,BIOPRD,summer.day,-0.0 +2040,21,,BIOPEL,summer.day,0.0 +2040,21,,BIOPRD,summer.peak,-0.0 +2040,21,,BIOPEL,summer.peak,0.0 +2040,21,,BIOPRD,summer.evening,-0.0 +2040,21,,BIOPEL,summer.evening,0.0 2040,21,,BIOPRD,autumn.night,-0.0 2040,21,,BIOPEL,autumn.night,0.0 2040,21,,BIOPRD,autumn.day,-0.0 @@ -1567,7 +1567,7 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,21,,BIOPEL,autumn.peak,0.0 2040,21,,BIOPRD,autumn.evening,-0.0 2040,21,,BIOPEL,autumn.evening,0.0 -2040,22,,BIOPRD,winter.night,4.612458079589464 +2040,22,,BIOPRD,winter.night,4.612458079588555 2040,22,,BIOPRD,winter.day,12.49820879942756 2040,22,,BIOPRD,winter.peak,3.749462627829988 2040,22,,BIOPRD,winter.evening,4.999283543767585 @@ -1729,9 +1729,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,27,,GASNAT,peak.day,-0.0 2040,27,,ELCTRI,peak.day,0.0 2040,27,,CO2EMT,peak.day,0.0 -2040,27,,GASNAT,peak.peak,-0.0 -2040,27,,ELCTRI,peak.peak,0.0 -2040,27,,CO2EMT,peak.peak,0.0 +2040,27,,GASNAT,peak.peak,-1.055344380172368 +2040,27,,ELCTRI,peak.peak,0.7035629201149121 +2040,27,,CO2EMT,peak.peak,53.95975815821318 2040,27,,GASNAT,peak.evening,-0.0 2040,27,,ELCTRI,peak.evening,0.0 2040,27,,CO2EMT,peak.evening,0.0 @@ -1750,9 +1750,9 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,27,,GASNAT,autumn.night,-0.0 2040,27,,ELCTRI,autumn.night,0.0 2040,27,,CO2EMT,autumn.night,0.0 -2040,27,,GASNAT,autumn.day,-0.0 -2040,27,,ELCTRI,autumn.day,0.0 -2040,27,,CO2EMT,autumn.day,0.0 +2040,27,,GASNAT,autumn.day,-1.9944787965014772 +2040,27,,ELCTRI,autumn.day,1.3296525310009848 +2040,27,,CO2EMT,autumn.day,101.97770086512053 2040,27,,GASNAT,autumn.peak,-3.386481899215612 2040,27,,ELCTRI,autumn.peak,2.2576545994770747 2040,27,,CO2EMT,autumn.peak,173.15081950689424 @@ -1771,18 +1771,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,28,,GASPRD,winter.evening,-0.0 2040,28,,GASNAT,winter.evening,0.0 2040,28,,CO2EMT,winter.evening,0.0 -2040,28,,GASPRD,peak.night,-0.0 -2040,28,,GASNAT,peak.night,0.0 -2040,28,,CO2EMT,peak.night,0.0 -2040,28,,GASPRD,peak.day,-0.0 -2040,28,,GASNAT,peak.day,0.0 -2040,28,,CO2EMT,peak.day,0.0 -2040,28,,GASPRD,peak.peak,-0.0 -2040,28,,GASNAT,peak.peak,0.0 -2040,28,,CO2EMT,peak.peak,0.0 -2040,28,,GASPRD,peak.evening,-0.0 -2040,28,,GASNAT,peak.evening,0.0 -2040,28,,CO2EMT,peak.evening,0.0 +2040,28,,GASPRD,peak.night,-0.4805415749359054 +2040,28,,GASNAT,peak.night,0.45765864279610036 +2040,28,,CO2EMT,peak.night,1.1700043203082306 +2040,28,,GASPRD,peak.day,-0.6864879632526814 +2040,28,,GASNAT,peak.day,0.6537980602406489 +2040,28,,CO2EMT,peak.day,1.671434741005219 +2040,28,,GASPRD,peak.peak,-0.20594638831677595 +2040,28,,GASNAT,peak.peak,0.19613941744454852 +2040,28,,CO2EMT,peak.peak,0.5014304206969883 +2040,28,,GASPRD,peak.evening,-0.2745951866191294 +2040,28,,GASNAT,peak.evening,0.2615192253515518 +2040,28,,CO2EMT,peak.evening,0.6685738996112423 2040,28,,GASPRD,summer.night,-0.4805415749359054 2040,28,,GASNAT,summer.night,0.45765864279610036 2040,28,,CO2EMT,summer.night,1.1700043203082306 @@ -1795,30 +1795,30 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,28,,GASPRD,summer.evening,-0.2745951866191294 2040,28,,GASNAT,summer.evening,0.2615192253515518 2040,28,,CO2EMT,summer.evening,0.6685738996112423 -2040,28,,GASPRD,autumn.night,-0.0 -2040,28,,GASNAT,autumn.night,0.0 -2040,28,,CO2EMT,autumn.night,0.0 -2040,28,,GASPRD,autumn.day,-0.0 -2040,28,,GASNAT,autumn.day,0.0 -2040,28,,CO2EMT,autumn.day,0.0 -2040,28,,GASPRD,autumn.peak,-0.0 -2040,28,,GASNAT,autumn.peak,0.0 -2040,28,,CO2EMT,autumn.peak,0.0 -2040,28,,GASPRD,autumn.evening,-0.0 -2040,28,,GASNAT,autumn.evening,0.0 -2040,28,,CO2EMT,autumn.evening,0.0 -2040,29,,OILCRD,winter.night,-0.0 -2040,29,,GASOLI,winter.night,0.0 -2040,29,,CO2EMT,winter.night,0.0 -2040,29,,OILCRD,winter.day,-0.0 -2040,29,,GASOLI,winter.day,0.0 -2040,29,,CO2EMT,winter.day,0.0 -2040,29,,OILCRD,winter.peak,-0.0 -2040,29,,GASOLI,winter.peak,0.0 -2040,29,,CO2EMT,winter.peak,0.0 -2040,29,,OILCRD,winter.evening,-0.0 -2040,29,,GASOLI,winter.evening,0.0 -2040,29,,CO2EMT,winter.evening,0.0 +2040,28,,GASPRD,autumn.night,-0.4805415749359054 +2040,28,,GASNAT,autumn.night,0.45765864279610036 +2040,28,,CO2EMT,autumn.night,1.1700043203082306 +2040,28,,GASPRD,autumn.day,-0.6864879632526814 +2040,28,,GASNAT,autumn.day,0.6537980602406489 +2040,28,,CO2EMT,autumn.day,1.671434741005219 +2040,28,,GASPRD,autumn.peak,-0.20594638831677595 +2040,28,,GASNAT,autumn.peak,0.19613941744454852 +2040,28,,CO2EMT,autumn.peak,0.5014304206969883 +2040,28,,GASPRD,autumn.evening,-0.2745951866191294 +2040,28,,GASNAT,autumn.evening,0.2615192253515518 +2040,28,,CO2EMT,autumn.evening,0.6685738996112423 +2040,29,,OILCRD,winter.night,-4.489875220956178 +2040,29,,GASOLI,winter.night,3.4273856648520447 +2040,29,,CO2EMT,winter.night,75.40248462674498 +2040,29,,OILCRD,winter.day,-19.76090675156108 +2040,29,,GASOLI,winter.day,15.084661642413037 +2040,29,,CO2EMT,winter.day,331.8625561330868 +2040,29,,OILCRD,winter.peak,-5.928272006497853 +2040,29,,GASOLI,winter.peak,4.525398478242636 +2040,29,,CO2EMT,winter.peak,99.55876652133799 +2040,29,,OILCRD,winter.evening,-7.904362738565372 +2040,29,,GASOLI,winter.evening,6.033864685927765 +2040,29,,CO2EMT,winter.evening,132.74502309041083 2040,29,,OILCRD,peak.night,-0.0 2040,29,,GASOLI,peak.night,0.0 2040,29,,CO2EMT,peak.night,0.0 @@ -1831,18 +1831,18 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,29,,OILCRD,peak.evening,-0.0 2040,29,,GASOLI,peak.evening,0.0 2040,29,,CO2EMT,peak.evening,0.0 -2040,29,,OILCRD,summer.night,-13.832634745063226 -2040,29,,GASOLI,summer.night,10.559263164170401 -2040,29,,CO2EMT,summer.night,232.30378961174884 -2040,29,,OILCRD,summer.day,-19.76090675156108 -2040,29,,GASOLI,summer.day,15.084661642413037 -2040,29,,CO2EMT,summer.day,331.8625561330868 -2040,29,,OILCRD,summer.peak,-5.928272006497853 -2040,29,,GASOLI,summer.peak,4.525398478242636 -2040,29,,CO2EMT,summer.peak,99.55876652133799 -2040,29,,OILCRD,summer.evening,-7.904362738565372 -2040,29,,GASOLI,summer.evening,6.033864685927765 -2040,29,,CO2EMT,summer.evening,132.74502309041083 +2040,29,,OILCRD,summer.night,-0.0 +2040,29,,GASOLI,summer.night,0.0 +2040,29,,CO2EMT,summer.night,0.0 +2040,29,,OILCRD,summer.day,-0.0 +2040,29,,GASOLI,summer.day,0.0 +2040,29,,CO2EMT,summer.day,0.0 +2040,29,,OILCRD,summer.peak,-0.0 +2040,29,,GASOLI,summer.peak,0.0 +2040,29,,CO2EMT,summer.peak,0.0 +2040,29,,OILCRD,summer.evening,-0.0 +2040,29,,GASOLI,summer.evening,0.0 +2040,29,,CO2EMT,summer.evening,0.0 2040,29,,OILCRD,autumn.night,-0.0 2040,29,,GASOLI,autumn.night,0.0 2040,29,,CO2EMT,autumn.night,0.0 @@ -1877,8 +1877,8 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,30,,BIOPEL,summer.day,0.0 2040,30,,BIOPRD,summer.peak,-0.0 2040,30,,BIOPEL,summer.peak,0.0 -2040,30,,BIOPRD,summer.evening,-0.0 -2040,30,,BIOPEL,summer.evening,0.0 +2040,30,,BIOPRD,summer.evening,-21.234248184366 +2040,30,,BIOPEL,summer.evening,20.223093508919998 2040,30,,BIOPRD,autumn.night,-0.0 2040,30,,BIOPEL,autumn.night,0.0 2040,30,,BIOPRD,autumn.day,-124.30336344597852 @@ -1919,19 +1919,19 @@ milestone_year,asset_id,group_id,commodity_id,time_slice,flow 2040,31,,CO2EMT,autumn.peak,0.0 2040,31,,GASPRD,autumn.evening,0.0 2040,31,,CO2EMT,autumn.evening,0.0 -2040,32,,BIOPRD,winter.night,183.04001908277655 -2040,32,,BIOPRD,winter.day,261.48574118821466 -2040,32,,BIOPRD,winter.peak,78.44572210543808 -2040,32,,BIOPRD,winter.evening,104.59429697733847 +2040,32,,BIOPRD,winter.night,183.04001908277684 +2040,32,,BIOPRD,winter.day,261.485741188215 +2040,32,,BIOPRD,winter.peak,78.4457221054382 +2040,32,,BIOPRD,winter.evening,104.59429697733862 2040,32,,BIOPRD,peak.night,0.0 -2040,32,,BIOPRD,peak.day,191.2640996787425 -2040,32,,BIOPRD,peak.peak,78.44572210543808 -2040,32,,BIOPRD,peak.evening,104.59429697733847 +2040,32,,BIOPRD,peak.day,191.26409967874227 +2040,32,,BIOPRD,peak.peak,78.4457221054382 +2040,32,,BIOPRD,peak.evening,104.59429697733862 2040,32,,BIOPRD,summer.night,0.0 2040,32,,BIOPRD,summer.day,0.0 2040,32,,BIOPRD,summer.peak,0.0 -2040,32,,BIOPRD,summer.evening,21.234248184366002 +2040,32,,BIOPRD,summer.evening,21.234248184366 2040,32,,BIOPRD,autumn.night,0.0 -2040,32,,BIOPRD,autumn.day,124.89540395348263 -2040,32,,BIOPRD,autumn.peak,78.44572210543808 -2040,32,,BIOPRD,autumn.evening,104.59429697733847 +2040,32,,BIOPRD,autumn.day,124.89540395348237 +2040,32,,BIOPRD,autumn.peak,78.4457221054382 +2040,32,,BIOPRD,autumn.evening,104.59429697733862 diff --git a/tests/data/two_outputs/commodity_prices.csv b/tests/data/two_outputs/commodity_prices.csv index 3f3afb93c..25af19a99 100644 --- a/tests/data/two_outputs/commodity_prices.csv +++ b/tests/data/two_outputs/commodity_prices.csv @@ -351,115 +351,115 @@ milestone_year,commodity_id,region_id,time_slice,price 2040,OILCRD,GBR,autumn.day,6.760586086603556 2040,OILCRD,GBR,autumn.peak,6.760586086603556 2040,OILCRD,GBR,autumn.evening,6.760586086603556 -2040,BIOPRD,GBR,winter.night,0.8675225048779815 -2040,BIOPRD,GBR,winter.day,0.8675225048779815 -2040,BIOPRD,GBR,winter.peak,0.8675225048779815 -2040,BIOPRD,GBR,winter.evening,0.8675225048779815 -2040,BIOPRD,GBR,peak.night,0.833786623727886 -2040,BIOPRD,GBR,peak.day,0.833786623727886 -2040,BIOPRD,GBR,peak.peak,0.833786623727886 -2040,BIOPRD,GBR,peak.evening,0.833786623727886 -2040,BIOPRD,GBR,summer.night,0.8337866237278859 -2040,BIOPRD,GBR,summer.day,0.8337866237278859 -2040,BIOPRD,GBR,summer.peak,0.8337866237278859 -2040,BIOPRD,GBR,summer.evening,0.8337866237278859 -2040,BIOPRD,GBR,autumn.night,0.8337866237278858 -2040,BIOPRD,GBR,autumn.day,0.8337866237278858 -2040,BIOPRD,GBR,autumn.peak,0.8337866237278858 -2040,BIOPRD,GBR,autumn.evening,0.8337866237278858 -2040,GASNAT,GBR,winter.night,10.340969488795766 -2040,GASNAT,GBR,winter.day,10.340969488795766 -2040,GASNAT,GBR,winter.peak,10.340969488795766 -2040,GASNAT,GBR,winter.evening,10.340969488795766 -2040,GASNAT,GBR,peak.night,10.340969488795766 -2040,GASNAT,GBR,peak.day,10.340969488795766 -2040,GASNAT,GBR,peak.peak,10.340969488795766 -2040,GASNAT,GBR,peak.evening,10.340969488795766 -2040,GASNAT,GBR,summer.night,13.042882408331224 -2040,GASNAT,GBR,summer.day,13.042882408331224 -2040,GASNAT,GBR,summer.peak,13.042882408331224 -2040,GASNAT,GBR,summer.evening,13.042882408331224 -2040,GASNAT,GBR,autumn.night,10.340969488795764 -2040,GASNAT,GBR,autumn.day,10.340969488795764 -2040,GASNAT,GBR,autumn.peak,10.340969488795764 -2040,GASNAT,GBR,autumn.evening,10.340969488795764 -2040,GASOLI,GBR,winter.night,11.879824816909009 -2040,GASOLI,GBR,winter.day,11.879824816909009 -2040,GASOLI,GBR,winter.peak,11.879824816909009 -2040,GASOLI,GBR,winter.evening,11.879824816909009 -2040,GASOLI,GBR,peak.night,11.879824816909009 -2040,GASOLI,GBR,peak.day,11.879824816909009 -2040,GASOLI,GBR,peak.peak,11.879824816909009 -2040,GASOLI,GBR,peak.evening,11.879824816909009 -2040,GASOLI,GBR,summer.night,12.685701921796635 -2040,GASOLI,GBR,summer.day,12.685701921796635 -2040,GASOLI,GBR,summer.peak,12.685701921796635 -2040,GASOLI,GBR,summer.evening,12.685701921796635 -2040,GASOLI,GBR,autumn.night,11.879824816909009 -2040,GASOLI,GBR,autumn.day,11.879824816909009 -2040,GASOLI,GBR,autumn.peak,11.879824816909009 -2040,GASOLI,GBR,autumn.evening,11.879824816909009 -2040,BIOPEL,GBR,winter.night,2.0583048031004245 -2040,BIOPEL,GBR,winter.day,2.0583048031004245 -2040,BIOPEL,GBR,winter.peak,2.0583048031004245 -2040,BIOPEL,GBR,winter.evening,2.0583048031004245 -2040,BIOPEL,GBR,peak.night,2.015167277123569 -2040,BIOPEL,GBR,peak.day,2.015167277123569 -2040,BIOPEL,GBR,peak.peak,2.015167277123569 -2040,BIOPEL,GBR,peak.evening,2.015167277123569 -2040,BIOPEL,GBR,summer.night,1.8060754070248644 -2040,BIOPEL,GBR,summer.day,1.8060754070248644 -2040,BIOPEL,GBR,summer.peak,1.8060754070248644 -2040,BIOPEL,GBR,summer.evening,1.8060754070248644 -2040,BIOPEL,GBR,autumn.night,2.0332278190327817 -2040,BIOPEL,GBR,autumn.day,2.0332278190327817 -2040,BIOPEL,GBR,autumn.peak,2.0332278190327817 -2040,BIOPEL,GBR,autumn.evening,2.0332278190327817 +2040,BIOPRD,GBR,winter.night,0.8675225048779827 +2040,BIOPRD,GBR,winter.day,0.8675225048779827 +2040,BIOPRD,GBR,winter.peak,0.8675225048779827 +2040,BIOPRD,GBR,winter.evening,0.8675225048779827 +2040,BIOPRD,GBR,peak.night,0.8337866237278865 +2040,BIOPRD,GBR,peak.day,0.8337866237278865 +2040,BIOPRD,GBR,peak.peak,0.8337866237278865 +2040,BIOPRD,GBR,peak.evening,0.8337866237278865 +2040,BIOPRD,GBR,summer.night,0.8337866237278865 +2040,BIOPRD,GBR,summer.day,0.8337866237278865 +2040,BIOPRD,GBR,summer.peak,0.8337866237278865 +2040,BIOPRD,GBR,summer.evening,0.8337866237278865 +2040,BIOPRD,GBR,autumn.night,0.8337866237278864 +2040,BIOPRD,GBR,autumn.day,0.8337866237278864 +2040,BIOPRD,GBR,autumn.peak,0.8337866237278864 +2040,BIOPRD,GBR,autumn.evening,0.8337866237278864 +2040,GASNAT,GBR,winter.night,9.009110726140989 +2040,GASNAT,GBR,winter.day,9.009110726140989 +2040,GASNAT,GBR,winter.peak,9.009110726140989 +2040,GASNAT,GBR,winter.evening,9.009110726140989 +2040,GASNAT,GBR,peak.night,10.281239720353442 +2040,GASNAT,GBR,peak.day,10.281239720353442 +2040,GASNAT,GBR,peak.peak,10.281239720353442 +2040,GASNAT,GBR,peak.evening,10.281239720353442 +2040,GASNAT,GBR,summer.night,13.065928595965172 +2040,GASNAT,GBR,summer.day,13.065928595965172 +2040,GASNAT,GBR,summer.peak,13.065928595965172 +2040,GASNAT,GBR,summer.evening,13.065928595965172 +2040,GASNAT,GBR,autumn.night,10.305236894030532 +2040,GASNAT,GBR,autumn.day,10.305236894030532 +2040,GASNAT,GBR,autumn.peak,10.305236894030532 +2040,GASNAT,GBR,autumn.evening,10.305236894030532 +2040,GASOLI,GBR,winter.night,12.734308213108111 +2040,GASOLI,GBR,winter.day,12.734308213108111 +2040,GASOLI,GBR,winter.peak,12.734308213108111 +2040,GASOLI,GBR,winter.evening,12.734308213108111 +2040,GASOLI,GBR,peak.night,11.863622719805186 +2040,GASOLI,GBR,peak.day,11.863622719805186 +2040,GASOLI,GBR,peak.peak,11.863622719805186 +2040,GASOLI,GBR,peak.evening,11.863622719805186 +2040,GASOLI,GBR,summer.night,11.863622719805186 +2040,GASOLI,GBR,summer.day,11.863622719805186 +2040,GASOLI,GBR,summer.peak,11.863622719805186 +2040,GASOLI,GBR,summer.evening,11.863622719805186 +2040,GASOLI,GBR,autumn.night,11.863622719805186 +2040,GASOLI,GBR,autumn.day,11.863622719805186 +2040,GASOLI,GBR,autumn.peak,11.863622719805186 +2040,GASOLI,GBR,autumn.evening,11.863622719805186 +2040,BIOPEL,GBR,winter.night,2.055176656657403 +2040,BIOPEL,GBR,winter.day,2.055176656657403 +2040,BIOPEL,GBR,winter.peak,2.055176656657403 +2040,BIOPEL,GBR,winter.evening,2.055176656657403 +2040,BIOPEL,GBR,peak.night,2.02066352522448 +2040,BIOPEL,GBR,peak.day,2.02066352522448 +2040,BIOPEL,GBR,peak.peak,2.02066352522448 +2040,BIOPEL,GBR,peak.evening,2.02066352522448 +2040,BIOPEL,GBR,summer.night,2.0185342742574615 +2040,BIOPEL,GBR,summer.day,2.0185342742574615 +2040,BIOPEL,GBR,summer.peak,2.0185342742574615 +2040,BIOPEL,GBR,summer.evening,2.0185342742574615 +2040,BIOPEL,GBR,autumn.night,2.0185342742574615 +2040,BIOPEL,GBR,autumn.day,2.0185342742574615 +2040,BIOPEL,GBR,autumn.peak,2.0185342742574615 +2040,BIOPEL,GBR,autumn.evening,2.0185342742574615 2040,ELCTRI,GBR,winter.night,12.46866812039744 2040,ELCTRI,GBR,winter.day,14.564818165174751 2040,ELCTRI,GBR,winter.peak,14.63333869253479 2040,ELCTRI,GBR,winter.evening,14.653257451883414 2040,ELCTRI,GBR,peak.night,12.46866812039744 2040,ELCTRI,GBR,peak.day,14.660428211582621 -2040,ELCTRI,GBR,peak.peak,16.138588375053057 -2040,ELCTRI,GBR,peak.evening,20.28559973591933 +2040,ELCTRI,GBR,peak.peak,15.65505188598532 +2040,ELCTRI,GBR,peak.evening,20.24696013021921 2040,ELCTRI,GBR,summer.night,13.22257263103542 -2040,ELCTRI,GBR,summer.day,20.53679823280372 -2040,ELCTRI,GBR,summer.peak,20.916238322050305 -2040,ELCTRI,GBR,summer.evening,34.17302101948597 +2040,ELCTRI,GBR,summer.day,20.534880122782315 +2040,ELCTRI,GBR,summer.peak,20.91419623751256 +2040,ELCTRI,GBR,summer.evening,36.25480496003295 2040,ELCTRI,GBR,autumn.night,12.46866812039744 -2040,ELCTRI,GBR,autumn.day,14.979747381729663 -2040,ELCTRI,GBR,autumn.peak,22.03973510049224 -2040,ELCTRI,GBR,autumn.evening,18.903867307247964 -2040,TPASKM,GBR,winter.night,23.15406005669583 -2040,TPASKM,GBR,winter.day,24.94498123548768 -2040,TPASKM,GBR,winter.peak,25.0035242123785 -2040,TPASKM,GBR,winter.evening,25.020542520806178 -2040,TPASKM,GBR,peak.night,23.15406005669583 -2040,TPASKM,GBR,peak.day,25.026669117251565 -2040,TPASKM,GBR,peak.peak,26.289588414942816 -2040,TPASKM,GBR,peak.evening,29.832736718362508 -2040,TPASKM,GBR,summer.night,24.60406259442274 -2040,TPASKM,GBR,summer.day,30.853234293417252 -2040,TPASKM,GBR,summer.peak,31.17742258022788 -2040,TPASKM,GBR,summer.evening,42.50383165797176 -2040,TPASKM,GBR,autumn.night,23.15406005669583 -2040,TPASKM,GBR,autumn.day,25.299490934580646 -2040,TPASKM,GBR,autumn.peak,31.33144535456376 -2040,TPASKM,GBR,autumn.evening,28.652203923920325 -2040,RSHEAT,GBR,winter.night,21.96154434147676 -2040,RSHEAT,GBR,winter.day,36.02292357151262 -2040,RSHEAT,GBR,winter.peak,82.84324071793836 -2040,RSHEAT,GBR,winter.evening,20.94468247760207 -2040,RSHEAT,GBR,peak.night,22.790892604495376 -2040,RSHEAT,GBR,peak.day,21.484842535833703 -2040,RSHEAT,GBR,peak.peak,40.497857433478764 -2040,RSHEAT,GBR,peak.evening,19.86375090518311 +2040,ELCTRI,GBR,autumn.day,15.227422402266413 +2040,ELCTRI,GBR,autumn.peak,19.010168234424643 +2040,ELCTRI,GBR,autumn.evening,18.882689758138085 +2040,TPASKM,GBR,winter.night,24.00854345289493 +2040,TPASKM,GBR,winter.day,25.79946463168679 +2040,TPASKM,GBR,winter.peak,25.858007608577605 +2040,TPASKM,GBR,winter.evening,25.875025917005278 +2040,TPASKM,GBR,peak.night,23.13785795959201 +2040,TPASKM,GBR,peak.day,25.010467020147743 +2040,TPASKM,GBR,peak.peak,25.860259528014137 +2040,TPASKM,GBR,peak.evening,29.783521484455367 +2040,TPASKM,GBR,summer.night,23.78198339243129 +2040,TPASKM,GBR,summer.day,30.02951628514419 +2040,TPASKM,GBR,summer.peak,30.35359864986804 +2040,TPASKM,GBR,summer.evening,43.460399436946034 +2040,TPASKM,GBR,autumn.night,23.13785795959201 +2040,TPASKM,GBR,autumn.day,25.494898898904506 +2040,TPASKM,GBR,autumn.peak,28.726823847062747 +2040,TPASKM,GBR,autumn.evening,28.61790802608392 +2040,RSHEAT,GBR,winter.night,21.958117146092448 +2040,RSHEAT,GBR,winter.day,36.019304918284824 +2040,RSHEAT,GBR,winter.peak,82.8395693822755 +2040,RSHEAT,GBR,winter.evening,20.94108808815804 +2040,RSHEAT,GBR,peak.night,22.796668984165102 +2040,RSHEAT,GBR,peak.day,21.490997901209166 +2040,RSHEAT,GBR,peak.peak,40.50445293119986 +2040,RSHEAT,GBR,peak.evening,19.870346402904204 2040,RSHEAT,GBR,summer.night,43.681738454746394 -2040,RSHEAT,GBR,summer.day,19.612840661064666 -2040,RSHEAT,GBR,summer.peak,19.612840661064666 -2040,RSHEAT,GBR,summer.evening,19.612840661064666 -2040,RSHEAT,GBR,autumn.night,23.48579424053915 -2040,RSHEAT,GBR,autumn.day,19.885423555474166 -2040,RSHEAT,GBR,autumn.peak,19.885423555474166 -2040,RSHEAT,GBR,autumn.evening,19.885423555474166 +2040,RSHEAT,GBR,summer.day,19.867791301743782 +2040,RSHEAT,GBR,summer.peak,19.867791301743782 +2040,RSHEAT,GBR,summer.evening,19.867791301743782 +2040,RSHEAT,GBR,autumn.night,23.47085792388237 +2040,RSHEAT,GBR,autumn.day,19.86779130174378 +2040,RSHEAT,GBR,autumn.peak,19.867791301743782 +2040,RSHEAT,GBR,autumn.evening,19.867791301743782