From ec62dfeb0ddd763876f46aaa4ff54fe1abbbe9ce Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 18 Dec 2024 13:21:38 +0000 Subject: [PATCH 1/5] Squashed commit of the following: commit 8f1333c4c92d344b7b6f95e9262194e1a6e331b5 Author: Tom Bland Date: Wed Dec 18 08:46:51 2024 +0000 Fix timeslice level error commit 35b4c285a3894523cff5f1f0712b5ced31b40a20 Author: Tom Bland Date: Tue Dec 17 14:14:56 2024 +0000 Use pytest parametrize commit ff793a36dcc85f187a02a152b78a0b1012942eb8 Author: Tom Bland Date: Tue Dec 17 14:10:52 2024 +0000 Add another test commit 9307fa1772d095039c43840b0d055b09a9782a21 Author: Tom Bland Date: Tue Dec 17 13:32:33 2024 +0000 Update remaining model commit e6215748e316e43cb2c9658e13326ec78c5ac90b Author: Tom Bland Date: Tue Dec 17 12:53:14 2024 +0000 Add new test for LCOE commit 2edb63116cb1c7296b45cdaffe6f85a7b7c81366 Merge: d6e26165 4b0200ff Author: Tom Bland Date: Tue Dec 17 11:08:23 2024 +0000 Merge branch 'costs2' of https://github.com/EnergySystemsModellingLab/MUSE_OS into costs2 commit d6e26165856564ec9047efdaa1484d997b8e5d6f Author: Tom Bland Date: Tue Dec 17 11:07:57 2024 +0000 Revert change to utilities commit 4b0200ff9e38194f268291806a68a9c1ba04c964 Merge: c4f8240f 339ea03d Author: Tom Bland Date: Tue Dec 17 10:46:55 2024 +0000 Merge branch 'main' into costs2 commit c4f8240f2e92abc9df40cfff2a3b2f1b41c41a11 Author: Tom Bland Date: Mon Dec 16 16:32:17 2024 +0000 Timeslice broadcasting fix commit 4b2d007c965770d2e07d1fa9678f976b420aaeac Author: Tom Bland Date: Mon Dec 16 15:59:18 2024 +0000 Remove redundant function commit 540d40f952589ed62c156edc7afdc23321b00707 Author: Tom Bland Date: Mon Dec 16 15:53:11 2024 +0000 Use crf for annualized capital costs commit 63d47a5fcb01d346901bc50a684515a1de310ae1 Author: Tom Bland Date: Mon Dec 16 15:14:44 2024 +0000 Typo commit 368898370a03d99f6fbf0cd3d0b82239412ef851 Author: Tom Bland Date: Mon Dec 16 11:43:59 2024 +0000 Revert "Changes to annual/lifetime costs to match original code" This reverts commit 384292542004fe70beb9dce93865d9d6ff101335. commit 384292542004fe70beb9dce93865d9d6ff101335 Author: Tom Bland Date: Mon Dec 16 11:26:50 2024 +0000 Changes to annual/lifetime costs to match original code commit 68bf8155c4c62acbf25060054d3faa04fa852c08 Merge: 4df625bc 03bbf49c Author: Tom Bland Date: Mon Dec 16 10:49:24 2024 +0000 Merge branch 'costs2' of https://github.com/EnergySystemsModellingLab/MUSE_OS into costs2 commit 03bbf49c33af92b7b7c454e25e13fe1455ed5048 Merge: 0c97585e a22b9d0c Author: Tom Bland Date: Fri Dec 13 17:10:32 2024 +0000 Merge branch 'objective_prices' into costs2 commit a22b9d0c5404a73e92cd97f75a1e051e1e2b8050 Author: Tom Bland Date: Fri Dec 13 16:25:57 2024 +0000 Pass objectives only prices from investment year commit 0c97585e2cca9992b6e1017c391c953bea9ba81f Merge: 50f0f39e fb2eba15 Author: Tom Bland Date: Fri Dec 13 16:01:25 2024 +0000 Merge branch 'consumption' into costs2 commit fb2eba15b78aac464dc2e6f9104aaf30a8ef8a57 Author: Tom Bland Date: Fri Dec 13 15:57:31 2024 +0000 Remove line commit bfe81eea5eb127e675aac1c714ea22926d87fc50 Author: Tom Bland Date: Fri Dec 13 15:51:54 2024 +0000 Fix tests commit d36b248acf69bd280bfdc70d92e384ad88c45fe5 Author: Tom Bland Date: Fri Dec 13 15:42:56 2024 +0000 Copy changes to quantities module from #556 commit 4df625bcad031c2e4ecf61b95c4da4004b9ddcd5 Author: Tom Bland Date: Fri Dec 13 14:50:53 2024 +0000 Add lifetime_to_annual commit 50f0f39ec7bf03d2bb080c8801a35db4a3e4791e Merge: b1754b4b 9a2ab3c2 Author: Tom Bland Date: Thu Dec 12 14:32:27 2024 +0000 Merge branch 'main' into costs2 commit b1754b4b0cafa0b66c8fdc0c026e25a99bcc785c Author: Tom Bland Date: Thu Dec 12 14:30:07 2024 +0000 Combine tests commit 6205f4d5f28d6679c1ce437942f7f0f6cabd38d1 Author: Tom Bland Date: Thu Dec 12 14:28:50 2024 +0000 Small improvements to consumption function commit 5abfe53c08bb2571bd41b3537ba3c175c65d20f4 Author: Tom Bland Date: Wed Dec 11 10:38:40 2024 +0000 Test for production_amplitude commit 9359cf7fe12b359237176368f52f6f08c2a3796e Author: Tom Bland Date: Tue Dec 10 09:57:37 2024 +0000 Fix timeslice_level error (more) commit 6bfe232bce691cc237d985a1b85d4bfb42d976dd Author: Tom Bland Date: Tue Dec 10 09:55:37 2024 +0000 Fix timeslice_level error commit cd532ab0fe81c32ebbad55feee9709375dcfa242 Author: Tom Bland Date: Mon Dec 9 19:16:24 2024 +0000 Add assertion commit e83193d0e126b54f7c86d146e2dc782bbd38b561 Author: Tom Bland Date: Mon Dec 9 17:07:16 2024 +0000 Beef up discount rate function commit fd77cf55dab34cf20a6dcc3d2c09926ee9462216 Author: Tom Bland Date: Mon Dec 9 16:20:04 2024 +0000 Docstrings for costs module commit c0395db96c3bfd0ba8cfbb719ffff75c93a91c83 Author: Tom Bland Date: Mon Dec 9 12:01:43 2024 +0000 Tests for new costs functions commit 8d7bb921ab36cbfea8dc0a14e5fd46a93dfe2272 Merge: 5c24b134 478c8e27 Author: Tom Bland Date: Mon Dec 9 11:49:19 2024 +0000 Merge branch 'main' into costs2 commit 5c24b13468e9a824149ffc5b9e04bf07b1d0c130 Author: Tom Bland Date: Mon Dec 9 11:46:46 2024 +0000 Fix error in capacity_to_service_demand function commit 45a0e3f94375df957d966d7c6a9f9c4b53170bf3 Merge: 8e927b12 a7bb1ee2 Author: Tom Bland Date: Fri Dec 6 17:30:16 2024 +0000 Merge branch 'main' into costs2 commit 8e927b12b16138b55a053b5a07cfadf2c9aef3d1 Author: Tom Bland Date: Fri Dec 6 17:26:19 2024 +0000 Modify objectives to use new cost functions commit cae24bfc2119c3155c4d8651265909af1b0de5a3 Author: Tom Bland Date: Fri Dec 6 16:42:20 2024 +0000 Separate functions for running cost components commit 0a54642d01e119decd9db4ae047a657d2f6d54f7 Author: Tom Bland Date: Fri Dec 6 16:19:36 2024 +0000 annual_to_lifetime function commit ec730ed0204cc5fdd2886b61b3a92620d11faed5 Author: Tom Bland Date: Fri Dec 6 15:59:33 2024 +0000 Functions for capital costs, running costs, annual_weights commit 58ffc1c3050dfbd4c974596fe7e9af6c4699b4ff Author: Tom Bland Date: Fri Dec 6 14:21:31 2024 +0000 Docstring description of lifetime vs annual commit 2d70544eb8f1de72d4a659d47e16c3a59c6ae96d Author: Tom Bland Date: Thu Dec 5 14:56:00 2024 +0000 Remove code, reorder commit eb4ddf526a2302a0f9cde68fd56a747a1168ec5e Author: Tom Bland Date: Thu Dec 5 14:46:16 2024 +0000 Tidy NPV function commit 88cbe33b3d9e3c191d694c3b49222db08390b139 Author: Tom Bland Date: Thu Dec 5 14:35:01 2024 +0000 Modern annotations in costs module commit c3d1fd6973e28b4b73664b9ac310cd671c047bea Author: Tom Bland Date: Thu Dec 5 14:30:40 2024 +0000 Combine lifetime and annual LCOE functions commit dc9f77bd5430f2a5c08ee5945cdaacf44dc07f65 Author: Tom Bland Date: Thu Dec 5 13:49:28 2024 +0000 Simplify checks commit 3cb4376f36e80dbe2d843076d0c2fbc941302dec Author: Tom Bland Date: Thu Dec 5 12:39:06 2024 +0000 Decorator to validate cost function inputs/outputs commit 58c0cabcebeb0cb46c884ef3037eb8bb09bc4ed3 Merge: c25918dd 9e9e7b9a Author: Tom Bland Date: Tue Dec 3 12:47:13 2024 +0000 Merge branch 'main' into costs2 commit c25918dde07dead6685f3976e914c5d98cc7d59a Merge: 0cfd1209 64e55a9f Author: Tom Bland Date: Tue Dec 3 12:38:50 2024 +0000 Merge branch 'v1.3' into costs2 commit 0cfd1209272452e5469b5eecf631c1373d317c96 Author: Tom Bland Date: Fri Nov 29 15:05:39 2024 +0000 Helper function for calculating production amplitude commit 28107f06693cc8e42c7db64d5c5f53b0ffba35fa Author: Tom Bland Date: Fri Nov 29 13:33:50 2024 +0000 Fix failing tests commit 89f2a1061628a42ce643cece05d836830b32e095 Merge: cda7af23 e448b093 Author: Tom Bland Date: Fri Nov 29 12:47:09 2024 +0000 Merge branch 'v1.3' into costs2 commit cda7af2380a129de6d7f73ec49a839a840469f85 Author: Tom Bland Date: Thu Nov 28 18:43:05 2024 +0000 Fix merge error commit fa11c361ac82a1fff85b64ce63a9c23b547026fa Merge: 53085691 f94ee1bd Author: Tom Bland Date: Thu Nov 28 09:12:43 2024 +0000 Merge branch 'v1.3' into costs2 commit 5308569122db2a14c5a01f1dd48bfe5da2228a16 Merge: e21130a7 c423ad53 Author: Tom Bland Date: Tue Nov 19 13:31:57 2024 +0000 Merge branch 'v1.3' into costs2 commit e21130a7088f035e64561e1749ab82e033ebbfd6 Merge: c071bc8b 375ebee9 Author: Tom Bland Date: Wed Nov 13 10:43:46 2024 +0000 Merge branch 'v1.3' into costs2 commit c071bc8b88c6b4e1b861f38ca6eba6d8decbde61 Merge: ef4112a7 1c8226c1 Author: Tom Bland Date: Tue Nov 12 17:55:50 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit ef4112a75751504942ec85f6a148070e386fbddb Author: Tom Bland Date: Tue Nov 12 17:53:59 2024 +0000 Rename variable commit 3baf63b4a7f00ccb934976441e46db9f6ce6ac96 Merge: 4310b5f2 4a9d29d7 Author: Tom Bland Date: Tue Nov 12 17:52:13 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit 1c8226c1d7786f4daa1a22fbcbec1544e39d6fb7 Merge: 4a9d29d7 cb253e6c Author: Tom Bland Date: Tue Nov 12 17:49:44 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit 4a9d29d76a5b4c667cfe7222ca41475eeec1fb9e Merge: b5918662 b0697c66 Author: Tom Bland Date: Tue Nov 12 17:44:39 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit 4310b5f2a574c402d718b4fd0bcaa79fbc674202 Author: Tom Bland Date: Tue Nov 12 11:50:10 2024 +0000 Update example model results commit b5918662acbb2b74b540a1686d5bd3d5f3773beb Merge: b78c843f 9b55d5de Author: Tom Bland Date: Tue Nov 12 11:45:51 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit 0754bd1a0e19a1ac354f21dca1627835368a1d61 Merge: 98d59559 953194cf Author: Tom Bland Date: Tue Nov 12 11:45:01 2024 +0000 Merge branch 'costs2' of https://github.com/EnergySystemsModellingLab/MUSE_OS into costs2 commit 953194cfc4a1f93498ccb38f5b0a747a534c842f Merge: cda674ca b5918662 Author: Tom Bland Date: Tue Nov 12 11:46:13 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit 98d59559747e7fb821f96beb5fab56aef979ca99 Author: Tom Bland Date: Tue Nov 12 10:53:33 2024 +0000 Update tutorial results commit cda674caa00a51672629173c374108af888a3a25 Merge: 2b611760 b78c843f Author: Tom Bland Date: Tue Nov 12 08:58:59 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit b78c843f7da07f57f273be6e74f9f351b8c6acde Author: Tom Bland Date: Mon Nov 11 17:00:43 2024 +0000 Docstring and better error message for patch commit e77b227b789333339d5dbb4a60b74f552cdb563f Merge: bd08d1f2 87132ab9 Author: Tom Bland Date: Mon Nov 11 16:32:56 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit 2b6117607d27e8c71366e7835fd4c710fe3175c9 Author: Tom Bland Date: Fri Nov 8 16:27:54 2024 +0000 Delete supply_cost tests commit 5cef7fdded6e181042c918945777c1c047444465 Author: Tom Bland Date: Fri Nov 8 16:21:39 2024 +0000 Delete legacy lcoe function commit 0d1759aa69d377cd80ecc88aa3690e6e0ce82e8b Merge: a767c54d bd08d1f2 Author: Tom Bland Date: Fri Nov 8 15:55:59 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit bd08d1f2522cce78047c5fe82afc0bad2d786ddb Merge: 59ba25c4 6406723e Author: Tom Bland Date: Fri Nov 8 15:52:59 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit a767c54d825ecb2f2badb2e1df8e028fb6a0a75a Author: Tom Bland Date: Fri Nov 8 12:08:14 2024 +0000 Simplify consumption tests (for now) commit fec7123ce7b749ed2550e57801d2525bc4df3d10 Author: Tom Bland Date: Fri Nov 8 10:54:08 2024 +0000 Revert a change to the consumption function commit 8737b60284eceef735dda29a7c93496aedc32400 Author: Tom Bland Date: Thu Nov 7 15:54:13 2024 +0000 Properly calculate consumption in objectives commit caacd9b30672df3a63603e658520deea0120f9b7 Author: Tom Bland Date: Thu Nov 7 15:34:17 2024 +0000 Fix consumption function commit 59ba25c43a701a024c7166b7eed614cda00ae32b Author: Tom Bland Date: Thu Nov 7 11:26:57 2024 +0000 Rename timeslice_op, add docstring commit 59cceb8bdd3b3596275384a1c6043988754b10e8 Author: Tom Bland Date: Thu Nov 7 09:54:47 2024 +0000 Delete sections from documentation commit d44d31e6bfdc50575f89638ea4bc701aafb2afa2 Author: Tom Bland Date: Thu Nov 7 09:36:08 2024 +0000 Fix merge errors commit 0a8a097626ff15e02a2147e581b55c9ef9240d65 Author: Tom Bland Date: Wed Nov 6 13:56:40 2024 +0000 Fix some tests commit 0c10f56428a690793656406c59ed72df0bdab921 Author: Tom Bland Date: Thu Nov 7 09:19:29 2024 +0000 Restore old ALCOE commit e650f0b2600ac9f5e6c27e87cbf8f1e48e20d746 Author: Tom Bland Date: Wed Nov 6 14:52:16 2024 +0000 Remove assert statements commit 798cc96fa69990f5a09508af1b354e065899005b Author: Tom Bland Date: Wed Nov 6 14:42:45 2024 +0000 Fix for timeslice models commit baae2e8f7ddbff15aec730e4713701f03fd29751 Author: Tom Bland Date: Wed Nov 6 14:34:53 2024 +0000 Restore old ALCOE as legacy function commit fb605f42481ff9b4f634f285a27d0d0b08d9a1b2 Merge: 128416d1 d3604dc8 Author: Tom Bland Date: Wed Nov 6 13:16:58 2024 +0000 Merge branch 'convert_timeslice2' into costs2 commit 128416d14a3852ba6194994bdb336ea69c50ff17 Author: Tom Bland Date: Wed Nov 6 12:51:51 2024 +0000 Pass consumption to costs, improve aLCOE commit 6021f2b19dcc7ff473f5cef81b76a99bbcfd5598 Author: Tom Bland Date: Wed Nov 6 10:21:51 2024 +0000 Properly fix merge error commit e97084301d48dbdc3c569da075a1d8f7671ec5fc Author: Tom Bland Date: Wed Nov 6 10:12:28 2024 +0000 Fix merge error commit 9acbd8bd56f0411af6b21057d73092b53b8543f1 Merge: 0518e5ad 92ca64eb Author: Tom Bland Date: Wed Nov 6 10:12:18 2024 +0000 Merge branch 'v1.3' into costs commit 0518e5ad1c7b1ebe6bd92c71ca9f4fda836caf22 Author: Tom Bland Date: Wed Nov 6 10:03:04 2024 +0000 Simplify costs module, add assert statements commit d3604dc800cd5278b4691cef52569cc4964891a7 Merge: 908be7be 92ca64eb Author: Tom Bland Date: Tue Nov 5 17:16:44 2024 +0000 Merge branch 'v1.3' into convert_timeslice2 commit 908be7be4c9f021bf32e193d9a2e7f243c5155b7 Author: Tom Bland Date: Mon Nov 4 14:44:48 2024 +0000 Remove timeslice attribute from sectors commit 366c37cef00ec0a6750670bc564b796564fe682a Author: Tom Bland Date: Fri Nov 1 15:57:56 2024 +0000 Drop convert_market_timeslice commit ae3c06cbe683717ef63c4d59ee7c922ccf95637a Author: Tom Bland Date: Wed Oct 30 11:36:09 2024 +0000 Turn off automatic broadcasting over the timeslice dimension (#530) * xarray patch to prevent automatic broadcasting * Fix most remaining broadcasting bugs * Fix some tests * Fix more tests * Simplify dlc constraint * More timeslice broadcasting * Fix incorrect uses of distribute_timeslice * Fix bug in _inner_split * Remove unnecessary drop_timeslice operations * Fix correlation model * Fix a couple of tests * Restore drop_timeslice * Restore more drop_timeslice * Fix demand_matching tests * Fix correlation model * Consistent timeslice dimension in objectives * Revert change to capacity_in_use * Fix objective tests * Fix more tests * Fix another test * Fix final test (hopefully) commit d5b5676e236f0cb72dcdced740c3e045df2fca20 Author: Tom Bland Date: Mon Oct 28 15:33:48 2024 +0000 Fix tests commit 46ab8208b04272229333d64cbc1fa8659b239267 Author: Tom Bland Date: Mon Oct 28 13:48:35 2024 +0000 Remove timeslice arguments commit d5875f99076ee0fff94513d0efb62ad95c4ab91b Author: Tom Bland Date: Mon Oct 28 13:38:08 2024 +0000 Fix tests commit fde592b92b680d04be93d3196e7d95dd1121a753 Merge: 433c39c2 b521d936 Author: Tom Bland Date: Mon Oct 28 13:32:21 2024 +0000 Merge branch 'legacy' into convert_timeslice2 commit b521d936f3708872efcb9dabebf083c3211198b1 Merge: 5c5fc45e c270dfa2 Author: Tom Bland Date: Mon Oct 28 11:33:46 2024 +0000 Merge branch 'refactor' into legacy commit c270dfa2045c414274f3dd10bd4fecffe73d1e17 Merge: 423fafef 48e0cd7a Author: Tom Bland Date: Mon Oct 28 11:33:14 2024 +0000 Merge branch 'main' into refactor commit 423fafef44a2d927c2f25df39a840e81853d3cdf Merge: 2e601ead 43c893c2 Author: Tom Bland Date: Mon Oct 28 08:57:22 2024 +0000 Merge branch 'main' into refactor commit 2e601ead6addffd2a716bb022b8f2f210ec3631f Merge: 69757877 be293589 Author: Tom Bland Date: Fri Oct 25 16:16:46 2024 +0100 Merge branch 'v1.2.2' into refactor commit 6975787707dfc586078c251d513c7f8f0e6e59d2 Merge: 8d06e855 2acef46e Author: Tom Bland Date: Fri Oct 25 14:39:04 2024 +0100 Merge branch 'broadcast_errors2' into refactor commit 433c39c2775cb6074945f23b181b95d5c0733571 Author: Tom Bland Date: Fri Oct 25 09:47:21 2024 +0100 Fix merge conflicts commit 885f752f48cca023a84f1910816ee0bde6e91e40 Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri Oct 25 08:33:20 2024 +0000 [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci commit 81490201e05d3136abb0038ee9779cc752d280bf Merge: b0ce2283 5c5fc45e Author: Tom Bland Date: Fri Oct 25 09:33:06 2024 +0100 Merge branch 'legacy' into convert_timeslice2 commit 5c5fc45ecb0abe36553b76cfec5d5df8c1d2c57f Merge: 4ce54e6e 8d06e855 Author: Tom Bland Date: Fri Oct 25 09:31:46 2024 +0100 Merge branch 'refactor' into legacy commit 8d06e85550683d7c994ac071ca9eb34a5223ee41 Merge: 65313de9 d7d47d69 Author: Tom Bland Date: Fri Oct 25 09:31:24 2024 +0100 Merge branch 'v1.3' into refactor commit b0ce2283e07cafd3927d4dfbb117187f060320c5 Author: Tom Bland Date: Tue Oct 22 17:51:13 2024 +0100 Fix test commit 0258ae983ce0254dd77398f9044cb8e9f8aab95e Author: Tom Bland Date: Tue Oct 22 17:28:41 2024 +0100 Check for existing timeslice dimension in broadcast_timeslice commit 4fbc1ff06e04035e33db66219011fa0e2edfb4dd Author: Tom Bland Date: Tue Oct 22 16:17:24 2024 +0100 Create separate functions for broadcasting and distributing timeslices commit 88d40b489f80f55685bebd6081f80106d97aaaa1 Author: Tom Bland Date: Tue Oct 22 09:07:30 2024 +0100 Fix remaining tests commit 4785412adff6da4e706685cc41b9fcb8269f63f2 Author: Tom Bland Date: Tue Oct 22 09:03:34 2024 +0100 Fix constraints tests commit a02088e0fc1f59c039469183d426727aba9790c4 Author: Tom Bland Date: Mon Oct 21 15:09:41 2024 +0100 Small changes commit ad3766e1f61a4864abdbf9321bc80a3cbd0cbdce Merge: c616694b 4ce54e6e Author: Tom Bland Date: Mon Oct 21 14:59:25 2024 +0100 Merge branch 'legacy' into convert_timeslice2 commit 4ce54e6e3cee3c19c311f9910dfc8e0500418d24 Merge: acdcbf89 65313de9 Author: Tom Bland Date: Mon Oct 21 14:11:15 2024 +0100 Merge branch 'refactor' into legacy commit 65313de90566a7cf6e4b822bcc9ac40573f3ecc0 Merge: 0c84ba9f 8e8b5bfe Author: Tom Bland Date: Mon Oct 21 14:07:25 2024 +0100 Merge branch 'v1.3' into refactor commit 0c84ba9feed0040ee38092ee688bf1f2a12b574c Author: Tom Bland Date: Thu Oct 17 15:12:34 2024 +0100 Remove inline comment commit d054a3ba9222f602f274c9886dce59975a14926f Author: Tom Bland Date: Thu Oct 17 15:09:31 2024 +0100 A few more tiny changes (e.g. typing) commit c616694b850c24004715b10b7fbb4a5e65e50f20 Author: Tom Bland Date: Thu Oct 17 09:43:02 2024 +0100 Fix docstring tests commit 1bd7c84493b0838e097820845d0394241dc728a9 Author: Tom Bland Date: Wed Oct 16 16:26:39 2024 +0100 Move default timeslice settings to conftest commit 86d7dd2f8eb80dc2b7adb5b07da19f16be7fb606 Merge: 80348071 acdcbf89 Author: Tom Bland Date: Wed Oct 16 15:54:39 2024 +0100 Merge branch 'legacy' into convert_timeslice2 commit 803480717917da2520e8efafdc5ebed176c76b3f Author: Tom Bland Date: Wed Oct 16 15:47:45 2024 +0100 Fix a fixture commit e0a8c3a1a31c88a9a1ac004e14a0def3df6af382 Author: Tom Bland Date: Wed Oct 16 15:23:34 2024 +0100 More test fixes commit 908872a8c95d795521ad5f1da38c91f28138131b Author: Tom Bland Date: Wed Oct 16 15:11:33 2024 +0100 Fix market fixtures commit 993af9f9b4766b6f798aaf158173025d430ec541 Author: Tom Bland Date: Wed Oct 16 15:02:09 2024 +0100 Delete unused fixture commit a59580cc7144bf5add7f2dab92d392471502110e Author: Tom Bland Date: Wed Oct 16 14:42:42 2024 +0100 Fix timeslice import in tests commit 22c141e22acb9cf2674f666b7903d2cda6a36efd Author: Tom Bland Date: Wed Oct 16 14:36:52 2024 +0100 Fix incorrect convert_timeslice usage in tests commit 793aacf0de2460717ba8d5b6abb83f129ba6251d Author: Tom Bland Date: Wed Oct 16 10:27:09 2024 +0100 More benign changes commit 89f8c618c787fa5abf8053c78c5644f59845a68f Author: Tom Bland Date: Wed Oct 16 10:19:05 2024 +0100 Carry changes from fix_supply_issue2 branch commit acdcbf89180e85b3cf308058ce87b9a42cc14dd3 Merge: 9360ad19 cc9d2370 Author: Tom Bland Date: Mon Oct 14 16:24:13 2024 +0100 Merge branch 'refactor' into legacy commit cc9d2370d1f95d495372f8c92a91d08a3dfd661c Author: Tom Bland Date: Mon Oct 14 16:22:05 2024 +0100 Fix test commit 94ef9b749a814b8255ce774b03a8fb66a4c0ff9e Merge: b2e8294a 9360ad19 Author: Tom Bland Date: Mon Oct 14 16:18:03 2024 +0100 Merge branch 'legacy' into convert_timeslice2 commit b2e8294a07e506d3b5d5eb1555279e868a027f20 Merge: c7f67f4f 3a053440 Author: Tom Bland Date: Mon Oct 14 16:15:02 2024 +0100 Merge branch 'legacy' into convert_timeslice2 commit 9360ad19f408ff578c3afea3babc115c010ec5f3 Merge: 3a053440 3b0cb49b Author: Tom Bland Date: Mon Oct 14 14:20:47 2024 +0100 Merge branch 'refactor' into legacy commit c7f67f4fe3e9c80fae79d9dfdd13fdfc9f5b5a38 Author: Tom Bland Date: Fri Oct 11 14:16:00 2024 +0100 Update results files commit 02884599498c86600f8f6e775ea4943dd55724ae Author: Tom Bland Date: Fri Oct 11 14:03:38 2024 +0100 Default arguments for convert_timeslice commit dc8b8b862ac2248b2dabc39322873463a2d6991c Author: Tom Bland Date: Fri Oct 11 12:00:34 2024 +0100 Formatting commit e4150e318b81a82c9752b3734f5eb270f720eab8 Author: Tom Bland Date: Fri Oct 11 12:00:11 2024 +0100 Simplify timeslie import process commit 57c1c73806a7e282d12ea8b07a417a54243d2ad8 Author: Tom Bland Date: Fri Oct 11 11:31:16 2024 +0100 Delete unused functions commit 19cf269ecbb9201bf790ba13c8fde781e4cb9a07 Author: Tom Bland Date: Fri Oct 11 11:07:20 2024 +0100 Delete old convert_timeslice function commit 81e7a6acbd18f6a84f5212dc78da1619367d6289 Author: Tom Bland Date: Fri Oct 11 11:02:55 2024 +0100 Simplify timeslice_op function commit 5cbc8f2afd2248961611511f6ea4e101a816c2f0 Author: Tom Bland Date: Fri Oct 11 10:53:56 2024 +0100 Remove remaining convert_timeslice calls commit c2b94e7a4782a3b1770fc75c82a24bc91bb17064 Author: Tom Bland Date: Fri Oct 11 10:08:46 2024 +0100 Fix issue with timeslice ordering commit a0fe43c3d4b605e43c7d8aced953d6659a8dc00d Author: Tom Bland Date: Thu Oct 10 16:18:05 2024 +0100 Remove represent_hours function commit 7ebab9ee3f1c8a58b67beb1f8aae812c001ec3ec Author: Tom Bland Date: Thu Oct 10 16:08:53 2024 +0100 Update tests commit d9eb060dd05c1dbce64062b30932d826491322a4 Author: Tom Bland Date: Thu Oct 10 14:01:00 2024 +0100 Use new function wherever possible commit 65c3e489002712be6e28b8f51c3183cfe4069adb Author: Tom Bland Date: Wed Oct 9 12:11:42 2024 +0100 Draft new function with intended behaviour commit 8faf4680f8eea03487083d0ab3b4f6689eefbce4 Author: Tom Bland Date: Tue Oct 8 16:12:07 2024 +0100 Simplify some other parts of the code accordingly commit 647d3fe14a99ae24106be9ebb7fe2ec660b66688 Author: Tom Bland Date: Tue Oct 8 15:57:37 2024 +0100 Use global TIMESLICE variable throughout commit 977647d39838594caff9a927b1ec04ae1fa5709f Author: Tom Bland Date: Tue Oct 8 15:20:39 2024 +0100 Remove unnecessary convert_timeslice operations commit 3a053440e517eec2407992a2a0b967f2f10a9c0a Author: Tom Bland Date: Fri Oct 4 15:56:28 2024 +0100 Delete new_to_old_timeslice function commit 3b0cb49bd6e1df925406f825c4e465fb6ed2f706 Author: Tom Bland Date: Fri Oct 4 15:51:45 2024 +0100 Remove more redundant code commit 1518034180c3f42d8081d0cfe16255fdacf09ecb Author: Tom Bland Date: Fri Oct 4 15:05:35 2024 +0100 Delete tests and documentation commit 51a5273f9720f95fa4126b6654e11414a490c616 Author: Tom Bland Date: Fri Oct 4 14:58:40 2024 +0100 Delete legacy sector commit 4fd2e79a486e026f31412f8362fc7e54f3ac8535 Author: Tom Bland Date: Fri Oct 4 14:02:07 2024 +0100 Small fix to another test commit 018ca5c3bb8c32dc438a3edf4802de4a057165e5 Author: Tom Bland Date: Fri Oct 4 12:32:59 2024 +0100 Fix tests commit e386da12460a0c11a249ec0d3a3571d0af8544d0 Author: Tom Bland Date: Fri Oct 4 12:10:10 2024 +0100 Revert some changes to fix tests commit 9d2cac9c4be1729193e2483373ff5a35f83ce974 Author: Tom Bland Date: Fri Oct 4 10:08:01 2024 +0100 More comments added to code commit 941a5a6824a162411bd1cdf0cc055649cf4fc3aa Author: Tom Bland Date: Fri Oct 4 10:07:36 2024 +0100 Delete unused factory commit 3e513111cbc1c15ac2acefc0bd442034300d7735 Author: Tom Bland Date: Fri Oct 4 10:06:02 2024 +0100 Revert change to merge_assets commit a86e07f7f5f3cc93e9868587e5be4a2bd247ecfa Author: Tom Bland Date: Thu Oct 3 14:56:04 2024 +0100 Simplify merge_assets commit b47c811957c92548257c107108229a969c8fd477 Author: Tom Bland Date: Thu Oct 3 14:15:51 2024 +0100 Simplify retirment profile code commit 697ff3f30a2f262a6f1cac39c0de7853298e7b54 Author: Tom Bland Date: Thu Oct 3 11:27:03 2024 +0100 Simplify agent module, more comments commit fa59017b69d00f2f545ca3aaeb512e89ccdbbdaa Author: Tom Bland Date: Wed Oct 2 17:10:56 2024 +0100 Add comments and simplify sector.next --- .../Results/MCACapacity.csv | 58 +- .../1-single-objective/Results/MCAPrices.csv | 216 +++--- .../Results/MCACapacity.csv | 149 ++-- .../Results/MCAPrices.csv | 216 +++--- .../1-correlation/Results/MCACapacity.csv | 53 +- .../1-correlation/Results/MCAPrices.csv | 216 +++--- .../1-introduction/Results/MCACapacity.csv | 64 +- .../1-introduction/Results/MCAPrices.csv | 216 +++--- .../2-scenario/Results/MCACapacity.csv | 63 +- .../2-scenario/Results/MCAPrices.csv | 216 +++--- .../1-new-region/Results/MCACapacity.csv | 179 ++--- .../1-new-region/Results/MCAPrices.csv | 432 +++++------ .../Results/MCACapacity.csv | 79 +- .../1-exogenous-demand/Results/MCAPrices.csv | 288 ++++---- .../1-carbon-budget/Results/MCAPrices.csv | 144 ++-- .../1-min-constraint/Results/MCAPrices.csv | 216 +++--- .../2-max-constraint/Results/MCAPrices.csv | 216 +++--- .../Results/MCACapacity.csv | 56 +- .../1-modify-timeslices/Results/MCAPrices.csv | 288 ++++---- .../Results/MCACapacity.csv | 198 ++--- .../Results/MCAPrices.csv | 480 ++++++------ .../technodata/power/Technodata.csv | 4 +- .../Results/MCACapacity.csv | 38 +- .../new-decision-metric/Results/MCAPrices.csv | 216 +++--- src/muse/costs.py | 697 ++++++++++-------- src/muse/objectives.py | 143 +++- src/muse/outputs/mca.py | 8 +- src/muse/quantities.py | 2 + src/muse/sectors/sector.py | 27 +- .../default/Results/MCACapacity.csv | 69 +- .../default/Results/MCAPrices.csv | 216 +++--- .../default_retro/Results/MCACapacity.csv | 63 +- .../default_retro/Results/MCAPrices.csv | 216 +++--- .../default_timeslice/Results/MCAPrices.csv | 216 +++--- .../medium/Results/MCACapacity.csv | 92 +-- .../medium/Results/MCAPrices.csv | 288 ++++---- .../minimum_service/Results/MCAPrices.csv | 48 +- .../multiple_agents/Results/MCACapacity.csv | 90 +-- .../multiple_agents/Results/MCAPrices.csv | 216 +++--- .../trade/Results/MCAPrices.csv | 216 +++--- tests/test_costs.py | 262 +++++-- tests/test_objectives.py | 2 +- 42 files changed, 3635 insertions(+), 3537 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv index a299a2d97..0ed971b73 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv @@ -18,47 +18,47 @@ A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 @@ -66,22 +66,22 @@ A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 @@ -90,24 +90,24 @@ A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,2.52780000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,0.37500000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,0.90630000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.68750000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,3.15630000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,2.40630000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A1,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 A1,1.45000000000,R1,2045,R1,gas,gassupply1,newcapa,2050 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A2,7.02400000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A2,0.48330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index c0b4ae36f..2af3c5bdf 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.18940000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,1.05280000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.18940000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,1.05280000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.18940000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,1.05280000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.18940000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,1.05280000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.18940000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,1.05280000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.18940000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,1.05280000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,1.14160000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,1.14160000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,1.14160000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,1.14160000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,1.14160000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,1.14160000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,1.46590000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,1.46590000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,1.46590000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,1.46590000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,1.46590000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,1.46590000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.78340000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.78340000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.78340000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.78340000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.78340000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.78340000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,2.22980000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,31.12680000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.24850000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,2.22980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.67520000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,19.32750000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,2.22980000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,31.12680000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.24850000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,2.22980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.67520000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,19.32750000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,2.22980000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,12.22360000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,16.40640000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,2.22980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.94940000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,17.86690000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.31490000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,2.67440000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,30.00890000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,24.65190000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.31490000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,2.67440000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.05190000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.82980000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,3.31490000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,2.67440000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,30.00890000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,24.65190000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.31490000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,2.67440000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.05190000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.82980000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.31490000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,2.67440000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,12.62180000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,19.11300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.31490000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,2.67440000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.57340000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,20.41870000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 4dd9eb605..9c2f8adbb 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -7,89 +7,102 @@ A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,2.36110000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.30560000000,R1,2020,R1,power,gasCCGT,newcapa,2025 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A2,9.17600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2030 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2030 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A2,5.42600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A2,5.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2035 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2035 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2035 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2035 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2040 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2040 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A2,4.18750000000,R1,2020,R1,power,windturbine,newcapa,2045 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,1.86110000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.80560000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A2,10.81250000000,R1,2025,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,3.37500000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,6.59380000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,1.81670000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A2,3.75000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,0.90620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 +A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,8.15620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index d436df88e..6dd836112 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.12460000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.61280000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.12460000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.61280000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.12460000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.61280000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.12460000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.61280000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.12460000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.61280000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.12460000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.61280000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.32670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.39560000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.32670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.39560000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.32670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.39560000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.32670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.39560000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.32670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.39560000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.32670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.39560000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.69200000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.42000000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.69200000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.42000000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.69200000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.42000000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.69200000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.42000000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.69200000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.42000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.69200000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.42000000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.85460000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.43080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.85460000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.43080000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.85460000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.43080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.85460000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.43080000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.85460000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.43080000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.85460000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.43080000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.10970000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.44780000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,30.68450000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.57100000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.10970000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.44780000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.01770000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,14.09200000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.10970000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.44780000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,30.68450000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.57100000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.10970000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.44780000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.01770000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,14.09200000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.10970000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.44780000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,11.35100000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.61310000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.10970000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.44780000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.18440000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.85260000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.32410000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.46210000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.95250000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.11000000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.32410000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.46210000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.53890000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.30160000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,3.32410000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.46210000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.95250000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.11000000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.32410000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.46210000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.53890000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.30160000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.32410000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.46210000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,11.43000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,6.01500000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.32410000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.46210000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.33200000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.89730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index 637d5a297..a529850e6 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -2,42 +2,35 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,16.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,20.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,13.12220000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,4.19000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index 2b564aa75..be5fc8b12 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.74180000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,27.78890000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.49630000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.74180000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.25210000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.90130000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.74180000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,27.78890000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.49630000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.74180000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.25210000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.90130000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.74180000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,13.79410000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.74180000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.51000000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.60580000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.23940000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.27490000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43960000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.40190000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.99130000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.23940000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.27490000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43960000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.40190000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.99130000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43960000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.80890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43960000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.51750000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.85760000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.62270000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.48200000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,30.11110000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.04090000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.62270000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.48200000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.98030000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.64400000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.62270000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.48200000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,30.11110000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.04090000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.62270000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.48200000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.98030000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.64400000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.62270000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.48200000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.62270000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.48200000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.95030000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,4.40730000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.53430000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.31080000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.27410000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,4.40730000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.53430000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.44920000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.79870000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,4.40730000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.53430000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.31080000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.27410000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,4.40730000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.53430000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.44920000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.79870000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.40730000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.53430000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,4.40730000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.53430000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.55290000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.08010000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,5.50800000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.60770000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,28.81720000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,15.68530000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,5.50800000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.60770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.12170000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.40800000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,5.50800000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.60770000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,28.81720000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,15.68530000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,5.50800000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.60770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.12170000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.40800000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,5.50800000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.60770000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.50800000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.60770000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.30790000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.78780000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,6.34520000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.66350000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,28.34170000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.84390000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,6.34520000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.66350000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.80620000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.51320000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,6.34520000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.66350000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,28.34170000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.84390000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,6.34520000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.66350000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.80620000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.51320000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,6.34520000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.66350000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,6.34520000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.66350000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.07180000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.86650000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv index 9b5b76e2c..a8aaa10bb 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv @@ -4,58 +4,36 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 +A1,16.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 +A1,12.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,5.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,7.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,22.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index b43e23033..bd9949c60 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.36010000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,23.72940000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,13.92520000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.36010000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62520000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.44690000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.34790000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.36010000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,23.72940000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,13.92520000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.36010000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62520000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.44690000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.34790000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.36010000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62520000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,9.46380000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,6.86530000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.36010000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62520000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,12.80570000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,8.55920000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.92930000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43580000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,23.13530000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,13.43880000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.92930000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43580000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,15.42350000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.95920000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.92930000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43580000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,23.13530000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,13.43880000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.92930000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43580000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,15.42350000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.95920000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.92930000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43580000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.92930000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43580000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,11.56760000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,6.71940000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.30930000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.58310000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.30930000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46110000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.05540000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.30930000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.58310000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.30930000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46110000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.05540000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.30930000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46110000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.30930000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46110000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,6.79160000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.60890000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48110000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,24.19760000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.60890000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48110000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.13180000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.60890000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48110000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,24.19760000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.60890000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48110000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.13180000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.60890000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48110000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.60890000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48110000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,12.09880000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.98120000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.50590000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.00810000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.98120000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.50590000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.33870000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,3.98120000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.50590000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.00810000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.98120000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.50590000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.33870000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.98120000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.50590000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.98120000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.50590000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.00400000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.36740000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.36740000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53170000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.36740000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.36740000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53170000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.36740000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53170000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.36740000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53170000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 81bc21370..9d0e2acf9 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -2,56 +2,41 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,19.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,11.62600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,5.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,7.91410000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,8.47780000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index 979575543..b5e21cadc 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.34640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62450000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.34640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.34640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62450000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.34640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62450000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.34640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62450000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.89960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43380000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.95190000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.34350000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.89960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43380000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.96800000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.09370000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.89960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43380000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.95190000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.34350000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.89960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43380000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.96800000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.09370000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.89960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43380000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,10.32830000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.92150000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.89960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43380000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.97600000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.96880000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.31360000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46140000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.49290000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.30980000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.31360000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46140000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.66190000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.87320000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.31360000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46140000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,29.49290000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.30980000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.31360000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46140000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.66190000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.87320000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.31360000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46140000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.83100000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.57430000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.31360000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46140000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.74650000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.15490000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.62360000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48210000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.11580000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.12620000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.62360000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48210000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.41060000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.75080000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.62360000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48210000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.11580000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.12620000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.62360000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48210000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.41060000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.75080000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.62360000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48210000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.70530000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.37540000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.62360000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48210000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.55790000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.06310000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.04280000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51000000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,28.57480000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,15.97540000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.04280000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51000000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.04990000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.65020000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.04280000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51000000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,28.57480000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,15.97540000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.04280000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51000000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.04990000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.65020000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.04280000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.52490000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.32510000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.04280000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51000000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.28740000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.98770000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.35850000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53110000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,28.15410000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.75900000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.35850000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53110000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.76940000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.50600000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.35850000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53110000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,28.15410000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.75900000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.35850000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53110000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.76940000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.50600000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.35850000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53110000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.38470000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.25300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.35850000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53110000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.07700000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.87950000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 21090c46b..8372798e6 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -5,130 +5,71 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,7.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,18.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 -A1,19.00000000000,R2,2020,R2,residential,heatpump,newcapa,2030 -A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2030 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,10.63440000000,R2,2020,R2,gas,gassupply1,newcapa,2030 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,9.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 -A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 -A1,1.00000000000,R2,2025,R2,residential,heatpump,newcapa,2035 -A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2035 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2035 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,24.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,30.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,19.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2030 +A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,23.43330000000,R2,2020,R2,gas,gassupply1,newcapa,2030 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 +A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2035 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2035 +A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 -A1,19.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 -A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2040 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2040 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2040 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2040 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2040 +A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2040 +A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 -A1,1.00000000000,R2,2035,R2,residential,heatpump,newcapa,2045 -A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R2,2020,R2,power,windturbine,newcapa,2045 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 -A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,3.86670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2045 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2045 -A1,3.86670000000,R2,2040,R2,gas,gassupply1,newcapa,2045 +A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 +A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2045 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2045 +A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2045 +A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 -A1,19.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,1.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R2,2025,R2,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 -A1,3.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 -A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 -A1,4.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.86560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,11.36670000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,4.51110000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 -A1,3.13440000000,R2,2020,R2,gas,gassupply1,newcapa,2050 -A1,11.86560000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,11.36670000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,4.51110000000,R2,2035,R2,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R2,2040,R2,gas,gassupply1,newcapa,2050 -A1,3.86670000000,R2,2045,R2,gas,gassupply1,newcapa,2050 +A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 +A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,11.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2050 +A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2050 +A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2050 +A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 940f2c7ac..834c47225 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.37740000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,14.43830000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,14.43830000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.37740000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,2.37740000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,13.20140000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,13.20140000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,14.43830000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,14.43830000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,13.20140000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,13.20140000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.96460000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.96460000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.37740000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,2.37740000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.58300000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.58300000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.93060000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,2.93060000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.66110000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.66110000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,16.70430000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,16.70430000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93060000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.93060000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.66110000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.66110000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.50860000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.50860000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93060000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.93060000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.66110000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.66110000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,16.70430000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,16.70430000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93060000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.93060000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.66110000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.66110000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.50860000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.50860000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93060000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.93060000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.66110000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.66110000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.35420000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,14.35420000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93060000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.93060000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.66110000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.66110000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,14.91080000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,14.91080000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.47030000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.47030000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.90280000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.90280000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,20.57330000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,20.57330000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.47030000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,3.47030000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.90280000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.90280000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.33650000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.33650000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.47030000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,3.47030000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.90280000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.90280000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,20.57330000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,20.57330000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.47030000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,3.47030000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.90280000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.90280000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.33650000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.33650000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.47030000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,3.47030000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.90280000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.90280000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,18.09960000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,18.09960000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.47030000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,3.47030000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.90280000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.90280000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,18.71800000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,18.71800000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.94520000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.94520000000,R2,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.19300000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,1.19300000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,24.31870000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,24.31870000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.94520000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.94520000000,R2,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.19300000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,1.19300000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,23.08180000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,23.08180000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.94520000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.94520000000,R2,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.19300000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,1.19300000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,24.31870000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,24.31870000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.94520000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.94520000000,R2,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.19300000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,1.19300000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,23.08180000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,23.08180000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.94520000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.94520000000,R2,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.19300000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,1.19300000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,21.84500000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,21.84500000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.94520000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.94520000000,R2,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.19300000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,1.19300000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,22.46340000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,22.46340000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.57430000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,4.57430000000,R2,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,1.55640000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,1.55640000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,31.24370000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,31.24370000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.57430000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,4.57430000000,R2,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,1.55640000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,1.55640000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,24.78030000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,24.78030000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.57430000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,4.57430000000,R2,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,1.55640000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,1.55640000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,31.24370000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,31.24370000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.57430000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,4.57430000000,R2,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,1.55640000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,1.55640000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,24.78030000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,24.78030000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.57430000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,4.57430000000,R2,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,1.55640000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,1.55640000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.31680000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.31680000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.57430000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,4.57430000000,R2,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,1.55640000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,1.55640000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,21.54860000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,21.54860000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,5.10000000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,5.10000000000,R2,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,1.93640000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,1.93640000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,33.34050000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,33.34050000000,R2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,5.10000000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,5.10000000000,R2,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,1.93640000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,1.93640000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,25.49220000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,25.49220000000,R2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,5.10000000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,5.10000000000,R2,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,1.93640000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,1.93640000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,33.34050000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,33.34050000000,R2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,5.10000000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,5.10000000000,R2,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,1.93640000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,1.93640000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,25.49220000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,25.49220000000,R2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,5.10000000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,5.10000000000,R2,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,1.93640000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,1.93640000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,17.64400000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,17.64400000000,R2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.10000000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,5.10000000000,R2,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,1.93640000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,1.93640000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.56810000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.56810000000,R2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index 7cbe898cd..7a984d661 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -3,68 +3,53 @@ A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025 -A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,24.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,24.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,61.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,17.07890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,54.36670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 +A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2035 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,16.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,32.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.64110000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index f6e194be6..7478dbc8e 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,1.99970000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.60620000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.60050000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,0.54490000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,1.99970000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.60620000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,10.81680000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.22790000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,0.54490000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,1.99970000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.60620000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,10.19830000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,29.60050000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,0.54490000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,1.99970000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.60620000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,10.81680000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.22790000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,0.54490000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,1.99970000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.60620000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,10.19830000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,11.04390000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,0.54490000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,1.99970000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.60620000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,9.57990000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.54150000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,0.54490000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.51530000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.40820000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,9.88910000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,0.40820000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.51530000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.40820000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,12.60140000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,0.40820000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.51530000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.40820000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,12.00350000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,0.40820000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.51530000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.40820000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,12.60140000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,0.40820000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.51530000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.40820000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,12.00350000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,0.40820000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.51530000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.40820000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,11.42630000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,0.40820000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,2.76890000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.42510000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,11.70460000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.03190000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,0.42510000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,2.76890000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.42510000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,15.83490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.35460000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,0.42510000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,2.76890000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.42510000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,11.82530000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,29.03190000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,0.42510000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,2.76890000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.42510000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,15.83490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.35460000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,0.42510000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,2.76890000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.42510000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,11.82530000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,0.42510000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,2.76890000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.42510000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,7.90890000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.51590000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,0.42510000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.00630000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.44090000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,9.82050000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.64250000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,0.44090000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.00630000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.44090000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.76170000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,0.44090000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.00630000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.44090000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.64250000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,0.44090000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.00630000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.44090000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.76170000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,0.44090000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.00630000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.44090000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,0.44090000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.00630000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.44090000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.82120000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,0.44090000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.29010000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,3.29010000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,3.29010000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,3.29010000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,3.29010000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,3.29010000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,3.52320000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,31.08270000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,3.52320000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.65230000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,3.52320000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,31.08270000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,3.52320000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.65230000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,3.52320000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,12.33240000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,3.52320000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.93710000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index a2365f9cf..7c45f0b0b 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -23,75 +23,75 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.94810000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.84180000000,R1,0,MUS$2010/PJ,2025 -CO2f,all-week,night,all-year,0.22000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.94810000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.84180000000,R1,1,MUS$2010/PJ,2025 -CO2f,all-week,morning,all-year,0.22000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.94810000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.84180000000,R1,2,MUS$2010/PJ,2025 -CO2f,all-week,afternoon,all-year,0.22000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.94810000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.84180000000,R1,3,MUS$2010/PJ,2025 -CO2f,all-week,early-peak,all-year,0.22000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.94810000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.84180000000,R1,4,MUS$2010/PJ,2025 -CO2f,all-week,late-peak,all-year,0.22000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.94810000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.84180000000,R1,5,MUS$2010/PJ,2025 -CO2f,all-week,evening,all-year,0.22000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.29370000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.39340000000,R1,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,0.17000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.29370000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.39340000000,R1,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,0.17000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.29370000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.39340000000,R1,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,0.17000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.29370000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.39340000000,R1,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,0.17000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.29370000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.39340000000,R1,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,0.17000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.29370000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.39340000000,R1,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,0.17000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.39690000000,R1,0,MUS$2010/PJ,2035 -CO2f,all-week,night,all-year,0.21000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.34640000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.39690000000,R1,1,MUS$2010/PJ,2035 -CO2f,all-week,morning,all-year,0.21000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.34640000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.39690000000,R1,2,MUS$2010/PJ,2035 -CO2f,all-week,afternoon,all-year,0.21000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.34640000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.39690000000,R1,3,MUS$2010/PJ,2035 -CO2f,all-week,early-peak,all-year,0.21000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.34640000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.39690000000,R1,4,MUS$2010/PJ,2035 -CO2f,all-week,late-peak,all-year,0.21000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.34640000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.39690000000,R1,5,MUS$2010/PJ,2035 -CO2f,all-week,evening,all-year,0.21000000000,R1,5,MUS$2010/kt,2035 +electricity,all-week,night,all-year,28.45650000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,15.82560000000,R1,0,MUS$2010/PJ,2025 +CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 +electricity,all-week,morning,all-year,19.71110000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.78500000000,R1,1,MUS$2010/PJ,2025 +CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 +electricity,all-week,afternoon,all-year,28.45650000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,15.82560000000,R1,2,MUS$2010/PJ,2025 +CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 +electricity,all-week,early-peak,all-year,19.71110000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.78500000000,R1,3,MUS$2010/PJ,2025 +CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 +electricity,all-week,late-peak,all-year,11.32510000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.85820000000,R1,4,MUS$2010/PJ,2025 +CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 +electricity,all-week,evening,all-year,15.33840000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.76470000000,R1,5,MUS$2010/PJ,2025 +CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 +electricity,all-week,night,all-year,26.13870000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,14.64020000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.14000000000,R1,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,19.77800000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.70100000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.14000000000,R1,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,26.13870000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,14.64020000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.14000000000,R1,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,19.77800000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.70100000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.14000000000,R1,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,14.05910000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,7.06670000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.14000000000,R1,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,16.59760000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.73140000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.14000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,28.31600000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,15.65540000000,R1,0,MUS$2010/PJ,2035 +CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2035 +electricity,all-week,morning,all-year,20.79320000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.20330000000,R1,1,MUS$2010/PJ,2035 +CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2035 +electricity,all-week,afternoon,all-year,28.31600000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,15.65540000000,R1,2,MUS$2010/PJ,2035 +CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2035 +electricity,all-week,early-peak,all-year,20.79320000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.20330000000,R1,3,MUS$2010/PJ,2035 +CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2035 +electricity,all-week,late-peak,all-year,13.43040000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,6.81520000000,R1,4,MUS$2010/PJ,2035 +CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2035 +electricity,all-week,evening,all-year,17.03180000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.97720000000,R1,5,MUS$2010/PJ,2035 +CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index dd19fb1ea..f2c4946fa 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56480000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56480000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.03690000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.57970000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,12.85430000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.75530000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56480000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.56480000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.98680000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.57370000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,7.81060000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.16510000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 307cd8986..9e580eb17 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.88040000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56120000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,13.93410000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.82840000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.88040000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56120000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.92540000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,8.28770000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.03100000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.57900000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,14.06800000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.12940000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.88040000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56120000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.92540000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,8.28770000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.80810000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.55080000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,5.07980000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.31070000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.80810000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.55080000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,7.03060000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.56400000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 16162d5a9..1b2c297a2 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -2,51 +2,41 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,22.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,28.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,20.85560000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 0b092637d..5a6369539 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.79230000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.45860000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,28.73140000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.54990000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.79230000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.45860000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,21.13150000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.00320000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,1.79230000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,0.45860000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,28.73140000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,12.54990000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.79230000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.45860000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,21.13150000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.00320000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.79230000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.45860000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.39310000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.79230000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.45860000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.06490000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.63880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,1.79230000000,R1,6,MUS$2010/PJ,2025 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,0.45860000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,16.06490000000,R1,6,MUS$2010/PJ,2025 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,11.63880000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,1.79230000000,R1,7,MUS$2010/PJ,2025 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,0.45860000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,16.06490000000,R1,7,MUS$2010/PJ,2025 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,11.63880000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.21540000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.29110000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.50550000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.21540000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.29110000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.99970000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.24310000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,2.21540000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,0.29110000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,15.50550000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.21540000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.29110000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.99970000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.24310000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.21540000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.29110000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.47790000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.21540000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.29110000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.73480000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,2.21540000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,0.29110000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,14.99980000000,R1,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,11.73480000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,2.21540000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,0.29110000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,14.99980000000,R1,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,11.73480000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.58250000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.30950000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.25160000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.58250000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.30950000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.37610000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,2.58250000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,0.30950000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,16.25160000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.58250000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.30950000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.37610000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.58250000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.30950000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.58250000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.30950000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.12580000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,2.58250000000,R1,6,MUS$2010/PJ,2035 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,0.30950000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2035 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,8.12580000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,2.58250000000,R1,7,MUS$2010/PJ,2035 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,0.30950000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2035 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,8.12580000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.83670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.32220000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.84660000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.09250000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.83670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.32220000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.89260000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.26480000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,2.83670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,0.32220000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,29.84660000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,16.09250000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.83670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.32220000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.89260000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.26480000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.83670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.32220000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.83670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.32220000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.92330000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.04630000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,2.83670000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,0.32220000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,14.92330000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,8.04630000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,2.83670000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,0.32220000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,14.92330000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,8.04630000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,3.22730000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.34170000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.19040000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,3.22730000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.34170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.33320000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,3.22730000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,0.34170000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,16.19040000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,3.22730000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.34170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.33320000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,3.22730000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.34170000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,3.22730000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.34170000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.09520000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,3.22730000000,R1,6,MUS$2010/PJ,2045 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,0.34170000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2045 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,8.09520000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,3.22730000000,R1,7,MUS$2010/PJ,2045 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,0.34170000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2045 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,8.09520000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,3.53820000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.35730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.16630000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.08020000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,3.53820000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.35730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,20.41640000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.25620000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,3.53820000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,0.35730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,29.16630000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,16.08020000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,3.53820000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.35730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,20.41640000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.25620000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,3.53820000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.35730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,3.53820000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.35730000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.58320000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.04010000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,3.53820000000,R1,6,MUS$2010/PJ,2050 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,0.35730000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,14.58320000000,R1,6,MUS$2010/PJ,2050 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,8.04010000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,3.53820000000,R1,7,MUS$2010/PJ,2050 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,0.35730000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,14.58320000000,R1,7,MUS$2010/PJ,2050 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,8.04010000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 6e98fc634..5b4e39d1d 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -2,144 +2,96 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 -A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 -A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 -A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 -A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 -A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 -A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 -A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2026 -A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 -A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 +A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2022 +A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 +A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2024 +A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2024 +A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2024 +A1,15.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 +A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2026 +A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2026 +A1,22.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2026 +A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2026 +A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2026 +A1,13.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 +A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2028 +A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 -A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 -A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,19.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2028 +A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2028 +A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2030 +A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2030 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 +A1,16.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2030 +A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2030 +A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 +A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2032 +A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 -A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2032 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2032 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 -A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2032 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2032 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2034 +A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 -A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 -A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2034 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 -A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2034 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2034 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 +A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 +A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2036 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 -A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 -A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 +A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2036 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2036 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2036 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 -A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 +A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2038 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 -A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 -A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 +A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2038 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 +A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 -A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2028,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2030,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2032,R1,power,gasCCGT,newcapa,2040 -A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 +A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 -A1,5.43220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 -A1,4.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,4.67000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 -A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 +A1,9.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2040 +A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index a15505dcc..21a1723f6 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.38660000000,R1,0,MUS$2010/PJ,2022 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,0.53220000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2022 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,11.14530000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,1.38660000000,R1,1,MUS$2010/PJ,2022 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,0.53220000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2022 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,10.58990000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,1.38660000000,R1,2,MUS$2010/PJ,2022 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,0.53220000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2022 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,11.14530000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,1.38660000000,R1,3,MUS$2010/PJ,2022 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,0.53220000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2022 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,10.58990000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,1.38660000000,R1,4,MUS$2010/PJ,2022 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,0.53220000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2022 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.91240000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,1.38660000000,R1,5,MUS$2010/PJ,2022 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,0.53220000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2022 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,10.21960000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,1.38660000000,R1,6,MUS$2010/PJ,2022 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,0.53220000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2022 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,10.21960000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,1.38660000000,R1,7,MUS$2010/PJ,2022 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,0.53220000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2022 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,10.21960000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,1.54420000000,R1,0,MUS$2010/PJ,2024 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,0.48120000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2024 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,12.08070000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,1.54420000000,R1,1,MUS$2010/PJ,2024 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,0.48120000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2024 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,11.53140000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,1.54420000000,R1,2,MUS$2010/PJ,2024 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,0.48120000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2024 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,12.08070000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,1.54420000000,R1,3,MUS$2010/PJ,2024 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,0.48120000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2024 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,11.53140000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,1.54420000000,R1,4,MUS$2010/PJ,2024 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,0.48120000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2024 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.86820000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,1.54420000000,R1,5,MUS$2010/PJ,2024 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,0.48120000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2024 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,11.16520000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,1.54420000000,R1,6,MUS$2010/PJ,2024 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,0.48120000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2024 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,11.16520000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,1.54420000000,R1,7,MUS$2010/PJ,2024 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,0.48120000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2024 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,11.16520000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,1.68400000000,R1,0,MUS$2010/PJ,2026 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,0.42020000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2026 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,13.01990000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,1.68400000000,R1,1,MUS$2010/PJ,2026 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,0.42020000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2026 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,12.47560000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,1.68400000000,R1,2,MUS$2010/PJ,2026 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,0.42020000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2026 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,13.01990000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,1.68400000000,R1,3,MUS$2010/PJ,2026 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,0.42020000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2026 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,12.47560000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,1.68400000000,R1,4,MUS$2010/PJ,2026 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,0.42020000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2026 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,11.82410000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,1.68400000000,R1,5,MUS$2010/PJ,2026 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,0.42020000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2026 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,12.11280000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,1.68400000000,R1,6,MUS$2010/PJ,2026 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,0.42020000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2026 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,12.11280000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,1.68400000000,R1,7,MUS$2010/PJ,2026 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,0.42020000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2026 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,12.11280000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,1.85430000000,R1,0,MUS$2010/PJ,2028 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,0.35360000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,21.78380000000,R1,0,MUS$2010/PJ,2028 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,13.79450000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,1.85430000000,R1,1,MUS$2010/PJ,2028 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,0.35360000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,20.43760000000,R1,1,MUS$2010/PJ,2028 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,13.05290000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,1.85430000000,R1,2,MUS$2010/PJ,2028 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,0.35360000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,21.78380000000,R1,2,MUS$2010/PJ,2028 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,13.79450000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,1.85430000000,R1,3,MUS$2010/PJ,2028 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,0.35360000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,20.43760000000,R1,3,MUS$2010/PJ,2028 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,13.05290000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,1.85430000000,R1,4,MUS$2010/PJ,2028 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,0.35360000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,20.03640000000,R1,4,MUS$2010/PJ,2028 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,12.24840000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,1.85430000000,R1,5,MUS$2010/PJ,2028 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,0.35360000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,20.03640000000,R1,5,MUS$2010/PJ,2028 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,12.59030000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,1.85430000000,R1,6,MUS$2010/PJ,2028 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,0.35360000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,20.03640000000,R1,6,MUS$2010/PJ,2028 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,12.59030000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,1.85430000000,R1,7,MUS$2010/PJ,2028 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,0.35360000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,20.03640000000,R1,7,MUS$2010/PJ,2028 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,12.59030000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,2.03990000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28240000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,27.14130000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.04110000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.03990000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28240000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.52480000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.39530000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,2.03990000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,0.28240000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,27.14130000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,15.04110000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.03990000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28240000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.52480000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.39530000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.03990000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28240000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,13.10640000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.46970000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.03990000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28240000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,16.11390000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.29810000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,2.03990000000,R1,6,MUS$2010/PJ,2030 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,0.28240000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,16.11390000000,R1,6,MUS$2010/PJ,2030 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,12.29810000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,2.03990000000,R1,7,MUS$2010/PJ,2030 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,0.28240000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,16.11390000000,R1,7,MUS$2010/PJ,2030 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,12.29810000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.27390000000,R1,0,MUS$2010/PJ,2032 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,0.29410000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,27.76890000000,R1,0,MUS$2010/PJ,2032 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,15.61150000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,2.27390000000,R1,1,MUS$2010/PJ,2032 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,0.29410000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,20.16660000000,R1,1,MUS$2010/PJ,2032 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,12.48980000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,2.27390000000,R1,2,MUS$2010/PJ,2032 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,0.29410000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,27.76890000000,R1,2,MUS$2010/PJ,2032 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,15.61150000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,2.27390000000,R1,3,MUS$2010/PJ,2032 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,0.29410000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,20.16660000000,R1,3,MUS$2010/PJ,2032 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,12.48980000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,2.27390000000,R1,4,MUS$2010/PJ,2032 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,0.29410000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,11.57930000000,R1,4,MUS$2010/PJ,2032 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,8.91720000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,2.27390000000,R1,5,MUS$2010/PJ,2032 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,0.29410000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,15.09840000000,R1,5,MUS$2010/PJ,2032 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,10.40860000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,2.27390000000,R1,6,MUS$2010/PJ,2032 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,0.29410000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,15.09840000000,R1,6,MUS$2010/PJ,2032 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,10.40860000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,2.27390000000,R1,7,MUS$2010/PJ,2032 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,0.29410000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,15.09840000000,R1,7,MUS$2010/PJ,2032 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,10.40860000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,2.51230000000,R1,0,MUS$2010/PJ,2034 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,0.30600000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,28.90960000000,R1,0,MUS$2010/PJ,2034 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,16.15900000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,2.51230000000,R1,1,MUS$2010/PJ,2034 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,0.30600000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,20.82540000000,R1,1,MUS$2010/PJ,2034 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,12.26530000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,2.51230000000,R1,2,MUS$2010/PJ,2034 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,0.30600000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,28.90960000000,R1,2,MUS$2010/PJ,2034 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,16.15900000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,2.51230000000,R1,3,MUS$2010/PJ,2034 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,0.30600000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,20.82540000000,R1,3,MUS$2010/PJ,2034 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,12.26530000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,2.51230000000,R1,4,MUS$2010/PJ,2034 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,0.30600000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,11.34000000000,R1,4,MUS$2010/PJ,2034 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,7.65920000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,2.51230000000,R1,5,MUS$2010/PJ,2034 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,0.30600000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,15.43600000000,R1,5,MUS$2010/PJ,2034 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,9.66950000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,2.51230000000,R1,6,MUS$2010/PJ,2034 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,0.30600000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,15.43600000000,R1,6,MUS$2010/PJ,2034 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,9.66950000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,2.51230000000,R1,7,MUS$2010/PJ,2034 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,0.30600000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,15.43600000000,R1,7,MUS$2010/PJ,2034 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,9.66950000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,2.64870000000,R1,0,MUS$2010/PJ,2036 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,0.31280000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,29.00110000000,R1,0,MUS$2010/PJ,2036 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,15.94520000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,2.64870000000,R1,1,MUS$2010/PJ,2036 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,0.31280000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,20.82440000000,R1,1,MUS$2010/PJ,2036 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,11.52040000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,2.64870000000,R1,2,MUS$2010/PJ,2036 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,0.31280000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,29.00110000000,R1,2,MUS$2010/PJ,2036 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,15.94520000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,2.64870000000,R1,3,MUS$2010/PJ,2036 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,0.31280000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,20.82440000000,R1,3,MUS$2010/PJ,2036 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,11.52040000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,2.64870000000,R1,4,MUS$2010/PJ,2036 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,0.31280000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,11.23880000000,R1,4,MUS$2010/PJ,2036 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,6.30000000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,2.64870000000,R1,5,MUS$2010/PJ,2036 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,0.31280000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,15.37320000000,R1,5,MUS$2010/PJ,2036 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,8.57040000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,2.64870000000,R1,6,MUS$2010/PJ,2036 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,0.31280000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,15.37320000000,R1,6,MUS$2010/PJ,2036 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,8.57040000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,2.64870000000,R1,7,MUS$2010/PJ,2036 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,0.31280000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,15.37320000000,R1,7,MUS$2010/PJ,2036 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,8.57040000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,2.76990000000,R1,0,MUS$2010/PJ,2038 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,0.31890000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,29.01340000000,R1,0,MUS$2010/PJ,2038 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,15.96350000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,2.76990000000,R1,1,MUS$2010/PJ,2038 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,0.31890000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,20.84430000000,R1,1,MUS$2010/PJ,2038 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,11.54170000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,2.76990000000,R1,2,MUS$2010/PJ,2038 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,0.31890000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,29.01340000000,R1,2,MUS$2010/PJ,2038 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,15.96350000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,2.76990000000,R1,3,MUS$2010/PJ,2038 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,0.31890000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,20.84430000000,R1,3,MUS$2010/PJ,2038 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,11.54170000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,2.76990000000,R1,4,MUS$2010/PJ,2038 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,0.31890000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,11.30590000000,R1,4,MUS$2010/PJ,2038 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,6.34770000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,2.76990000000,R1,5,MUS$2010/PJ,2038 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,0.31890000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,15.39820000000,R1,5,MUS$2010/PJ,2038 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,8.59380000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,2.76990000000,R1,6,MUS$2010/PJ,2038 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,0.31890000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,15.39820000000,R1,6,MUS$2010/PJ,2038 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,8.59380000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,2.76990000000,R1,7,MUS$2010/PJ,2038 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,0.31890000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,15.39820000000,R1,7,MUS$2010/PJ,2038 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,8.59380000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,2.87840000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.35420000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.32430000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.74200000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.87840000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.35420000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.32430000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,21.34970000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.82000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,2.87840000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,mid-afternoon,all-year,0.35420000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,0.32430000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,29.74200000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.87840000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.35420000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.32430000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,21.34970000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.82000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.87840000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.35420000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.32430000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,11.32890000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,6.36560000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.87840000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.35420000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.32430000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,15.75480000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.79060000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,2.87840000000,R1,6,MUS$2010/PJ,2040 -gas,all-week,early-morning,all-year,0.35420000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,0.32430000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,15.75480000000,R1,6,MUS$2010/PJ,2040 +gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,8.79060000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,2.87840000000,R1,7,MUS$2010/PJ,2040 -gas,all-week,late-afternoon,all-year,0.35420000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,0.32430000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,15.75480000000,R1,7,MUS$2010/PJ,2040 +gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,8.79060000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv index 24109432c..a23d8d32e 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv index 8ec81b808..99af66bd7 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv @@ -11,49 +11,49 @@ A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 A1,10.00000000000,R1,2020,R1,power,solarPV,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 A1,3.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,6.68000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,9.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,1.67000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index a5b7327d1..7d1d3c8b4 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,1.69560000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.59020000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,23.65520000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,13.53940000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,1.69560000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.59020000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,17.07860000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.18560000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,1.69560000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.59020000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,23.65520000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,13.53940000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,1.69560000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.59020000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,17.07860000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.18560000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,1.69560000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.59020000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,11.06570000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.01030000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,1.69560000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.59020000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,13.79030000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,8.50870000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,1.96770000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.37170000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,24.62710000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,14.03560000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,1.96770000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.37170000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,16.91320000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.55510000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,1.96770000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.37170000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,24.62710000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,14.03560000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,1.96770000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.37170000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,16.91320000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.55510000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,1.96770000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.37170000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.67720000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.31390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,1.96770000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.37170000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.05630000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,7.31490000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,2.02470000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.37550000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,25.63370000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,14.58250000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,2.02470000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.37550000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.59880000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.92550000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,2.02470000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.37550000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,25.63370000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,14.58250000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,2.02470000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.37550000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.59880000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.92550000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,2.02470000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.37550000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.73490000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.33700000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,2.02470000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.37550000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,13.58140000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.59710000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,2.12170000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.38190000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.79830000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,14.64830000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,2.12170000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.38190000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.73090000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.97840000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,2.12170000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.38190000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.79830000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,14.64830000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,2.12170000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.38190000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.73090000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.97840000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,2.12170000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.38190000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.81020000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.36710000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,2.12170000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.38190000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,13.69720000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.64340000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,2.26120000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.39120000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.02320000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,14.73830000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,2.26120000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.39120000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.93140000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.05860000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,2.26120000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.39120000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.02320000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,14.73830000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,2.26120000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.39120000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.93140000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.05860000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,2.26120000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.39120000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.96810000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.43020000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,2.26120000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.39120000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,13.88550000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.71870000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,2.43020000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.40250000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.77680000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.03970000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,2.43020000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.40250000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,18.47300000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.27520000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,2.43020000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.40250000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.77680000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.03970000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,2.43020000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.40250000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,18.47300000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.27520000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,2.43020000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.40250000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,10.28610000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.55750000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,2.43020000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.40250000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.32110000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.89300000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/src/muse/costs.py b/src/muse/costs.py index 4461113eb..cd247af48 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -1,33 +1,245 @@ """Collection of functions for calculating cost metrics (e.g. LCOE, EAC). -In general, these functions take a Dataset of technology parameters, and return a -DataArray of the calculated cost for each technology. Functions may also take additional -data such as commodity prices, capacity of the technologies, and commodity-production -data for the technologies, where appropriate. +All costs functions take a subset of the following arguments: +- technologies: xr.Dataset of technology parameters +- prices: xr.DataArray with commodity prices +- capacity: xr.DataArray with the capacity of the technologies +- production: xr.DataArray with commodity production by the technologies +- consumption: xr.DataArray with commodity consumption by the technologies +- timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") +- method: "lifetime" or "annual" + +Data should only be provided for a single year (i.e. no "year" dimension in any of the +inputs). Prices, production and consumption data should be split across timeslices +(i.e. have a "timeslice" dimension). Technology parameters may also be specified at +the timeslice level, but capacity should not be. + +`timeslice_level` is given as an argument to some functions, but in this case it must +match the timeslice level of any timesliced inputs, so is generally not configurable, +but only included to ensure consistency and provide explicitness. + +The `technologies` input will usually contain data for multiple technologies and have +a "technology" dimension (sometimes called "asset" or "replacement"). In this case, +it's important that the `capacity`, `production`, and `consumption` inputs have a +similar dimension to ensure that costs are calculated for all technologies and to +prevent unwanted broadcasting. + +Additional dimensions (such as "region") may be present in the inputs, but it's up to +the parent functions to ensure that these are consistent between inputs to prevent +unwanted broadcasting. + +The dimensions of the output will be the sum of all dimensions from the input data, +minus "commodity", plus "timeslice" (if not already present). + +Some functions have a `method` argument, which can be "annual" or "lifetime": + +Costs can either be annual or lifetime: +- annual: calculates the cost for each timeslice in a single year +- lifetime: calculates the total cost in each timeslice over the lifetime of the + technology, using the `technical_life` attribute from the `technologies` dataset. + - In this case, technology parameters, production, consumption, capacity and prices + are assumed to be constant over the lifetime of the technology. The cost in each + year is discounted according to the `interest_rate` attribute from the + `technologies` dataset, and summed across years. + - Capital costs are different, as these are a one time cost for the lifetime of the + technology. This can be annualized by dividing by the `technical_life`. +Some functions can calculate both lifetime and annual costs, with a `method` argument +to specify. Others can only calculate one or the other (see individual function +docstrings for more details). + """ -from typing import Optional, Union +from __future__ import annotations + +from functools import wraps import numpy as np import xarray as xr from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant -from muse.quantities import consumption +from muse.quantities import production_amplitude from muse.timeslices import broadcast_timeslice, distribute_timeslice from muse.utilities import filter_input +def cost(func): + """Decorator to validate the output dimensions of the cost functions.""" + + @wraps(func) + def wrapper(*args, **kwargs): + result = func(*args, **kwargs) + assert "year" not in result.dims + assert "timeslice" in result.dims + return result + + return wrapper + + +@cost +def capital_costs( + technologies: xr.Dataset, + capacity: xr.DataArray, + timeslice_level: str | None = None, + method: str = "lifetime", +): + """Calculate capital costs for the relevant technologies. + + This is the cost of installing each technology to the level specified by the + `capacity` input. + + Method can be "lifetime" or "annual": + - lifetime: returns the full capital costs + - annual: total capital costs are multiplied by the capital recovery factor to get + annualized costs + + Costs are distributed uniformly over timeslices, with the timeslice level specified + """ + if method not in ["lifetime", "annual"]: + raise ValueError("method must be either 'lifetime' or 'annual'.") + + _capital_costs = distribute_timeslice( + technologies.cap_par * (capacity**technologies.cap_exp), level=timeslice_level + ) + if method == "annual": + crf = capital_recovery_factor(technologies) + _capital_costs = _capital_costs * broadcast_timeslice( + crf, level=timeslice_level + ) + return _capital_costs + + +@cost +def environmental_costs( + technologies: xr.Dataset, prices: xr.DataArray, production: xr.DataArray +) -> xr.DataArray: + """Calculate annual environmental costs for the relevant technologies. + + This is the total production of pollutants (commodities flagged by `is_pollutant`) + multiplied by their prices. + """ + environmentals = is_pollutant(technologies.comm_usage) + prices_environmental = filter_input(prices, commodity=environmentals) + return (production * prices_environmental).sum("commodity") + + +@cost +def fuel_costs( + technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray +) -> xr.DataArray: + """Calculate annual fuel costs for the relevant technologies. + + This is the total consumption of fuels (commodities flagged by `is_fuel`) + multiplied by their prices. + """ + fuels = is_fuel(technologies.comm_usage) + prices_fuel = filter_input(prices, commodity=fuels) + return (consumption * prices_fuel).sum("commodity") + + +@cost +def material_costs( + technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray +) -> xr.DataArray: + """Calculate annual material costs for the relevant technologies. + + This is the total consumption of materials (commodities flagged by `is_material`) + multiplied by their prices. + """ + material = is_material(technologies.comm_usage) + prices_material = filter_input(prices, commodity=material) + return (consumption * prices_material).sum("commodity") + + +@cost +def fixed_costs( + technologies: xr.Dataset, capacity: xr.DataArray, timeslice_level: str | None = None +) -> xr.DataArray: + """Calculate annual fixed costs for the relevant technologies. + + This is the fixed running cost over the course of a year corresponding to the + `fix_par` and `fix_exp` technology parameters. + + This cost is scaled by the capacity of the technology and distributed uniformly + over the timeslices, with the timeslice level specified + """ + return distribute_timeslice( + technologies.fix_par * (capacity**technologies.fix_exp), level=timeslice_level + ) + + +@cost +def variable_costs( + technologies: xr.Dataset, + production: xr.DataArray, + timeslice_level: str | None = None, +) -> xr.DataArray: + """Calculate annual variable costs for the relevant technologies. + + This is the cost associated with the `var_par` and `var_exp` technology + parameters. + + The `production_amplitude` function is first used to calculate technology activity + in each timeslice based on `production`. This is then used to scale the variable + costs. + """ + tech_activity = production_amplitude(production, technologies, timeslice_level) + result = broadcast_timeslice( + technologies.var_par, level=timeslice_level + ) * tech_activity ** broadcast_timeslice( + technologies.var_exp, level=timeslice_level + ) + return result + + +@cost +def running_costs( + technologies: xr.Dataset, + prices: xr.DataArray, + capacity: xr.DataArray, + production: xr.DataArray, + consumption: xr.DataArray, + timeslice_level: str | None = None, +) -> xr.DataArray: + """Total annual running costs (excluding capital costs). + + This is the sum of environmental, fuel, material, fixed and variable costs. + + .. seealso:: + :py:func:`environmental_costs` + :py:func:`fuel_costs` + :py:func:`material_costs` + :py:func:`fixed_costs` + :py:func:`variable_costs` + """ + _environmental_costs = environmental_costs(technologies, prices, production) + _fuel_costs = fuel_costs(technologies, prices, consumption) + _material_costs = material_costs(technologies, prices, consumption) + _fixed_costs = fixed_costs(technologies, capacity, timeslice_level) + _variable_costs = variable_costs(technologies, production, timeslice_level) + + # Total running costs + result = ( + _environmental_costs + + _fuel_costs + + _material_costs + + _fixed_costs + + _variable_costs + ) + return result + + +@cost def net_present_value( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, + timeslice_level: str | None = None, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. - The net present value of a technology is the present value of all the revenues that + The net present value of a technology is the present value of all the revenues that a technology earns over its lifetime minus all the costs of installing and operating it. Follows the definition of the `net present cost`_ given by HOMER Energy. .. _net present cost: @@ -40,130 +252,54 @@ def net_present_value( installed capacity and production (non-environmental), respectively - capacity costs are given as technodata inputs and depend on the installed capacity - Note: - Here, the installation year is always agent.forecast_year, - since objectives compute the - NPV for technologies to be installed in the current year. A more general NPV - computation would have to refer to installation year of the technology. + .. seealso:: + :py:func:`capital_costs` + :py:func:`running_costs` Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPV calculated for the relevant technologies """ - # Filtering of the inputs - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "cap_exp", - "var_par", - "var_exp", - "fix_par", - "fix_exp", - "fixed_outputs", - "fixed_inputs", - "flexible_inputs", - "utilization_factor", - ] - ] - - # Years - life = techs.technical_life.astype(int) - iyears = range(year, max(year + life.values.max(), year + 1)) - years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") - - # Evolution of rates with time - rates = broadcast_timeslice( - discount_factor( - years - year + 1, - interest_rate=techs.interest_rate, - mask=years <= year + life, - ), - level=timeslice_level, + # Capital costs (lifetime) + _capital_costs = capital_costs( + technologies, capacity, timeslice_level, method="lifetime" ) - # Filters - environmentals = is_pollutant(technologies.comm_usage) - material = is_material(technologies.comm_usage) + # Revenue (annual) products = is_enduse(technologies.comm_usage) - fuels = is_fuel(technologies.comm_usage) - - # Calculate consumption - cons = consumption(technologies=techs, production=production, prices=prices) + prices_non_env = filter_input(prices, commodity=products) + revenues = (production * prices_non_env).sum("commodity") - # Revenue - prices_non_env = filter_input(prices, commodity=products, year=years.values) - raw_revenues = (production * prices_non_env * rates).sum(("commodity", "year")) - - # Cost of installed capacity - installed_capacity_costs = distribute_timeslice( - techs.cap_par * (capacity**techs.cap_exp), level=timeslice_level - ) - - # Cost related to environmental products - prices_environmental = filter_input( - prices, commodity=environmentals, year=years.values + # Running costs (annual) + _running_costs = running_costs( + technologies, prices, capacity, production, consumption, timeslice_level ) - environmental_costs = (production * prices_environmental * rates).sum( - ("commodity", "year") - ) - - # Fuel/energy costs - prices_fuel = filter_input(prices, commodity=fuels, year=years.values) - fuel_costs = (cons * prices_fuel * rates).sum(("commodity", "year")) - # Cost related to material other than fuel/energy and environmentals - prices_material = filter_input(prices, commodity=material, year=years.values) - material_costs = (cons * prices_material * rates).sum(("commodity", "year")) - - # Fixed costs - fixed_costs = ( - distribute_timeslice( - techs.fix_par * (capacity**techs.fix_exp), level=timeslice_level - ) - * rates - ).sum("year") - - # Variable costs - tech_activity = ( - production.sel(commodity=products) - / broadcast_timeslice(techs.fixed_outputs, level=timeslice_level) - ).max("commodity") - variable_costs = ( - ( - broadcast_timeslice(techs.var_par, level=timeslice_level) - * tech_activity ** broadcast_timeslice(techs.var_exp, level=timeslice_level) - ) - * rates - ).sum("year") + # Calculate running costs and revenues over lifetime + _running_costs = annual_to_lifetime(_running_costs, technologies, timeslice_level) + revenues = annual_to_lifetime(revenues, technologies, timeslice_level) # Net present value - result = raw_revenues - ( - installed_capacity_costs - + fuel_costs - + environmental_costs - + material_costs - + fixed_costs - + variable_costs - ) - + result = revenues - (_capital_costs + _running_costs) return result +@cost def net_present_cost( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, + consumption: xr.DataArray, + timeslice_level: str | None = None, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -178,22 +314,28 @@ def net_present_cost( technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies + timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPC calculated for the relevant technologies """ - return -net_present_value(technologies, prices, capacity, production, year) + result = -net_present_value( + technologies, prices, capacity, production, consumption, timeslice_level + ) + return result +@cost def equivalent_annual_cost( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, + timeslice_level: str | None = None, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -205,259 +347,113 @@ def equivalent_annual_cost( .. _annualized cost: https://www.homerenergy.com/products/pro/docs/3.15/annualized_cost.html + .. seealso:: + :py:func:`net_present_cost` + Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the EAC calculated for the relevant technologies """ - npc = net_present_cost(technologies, prices, capacity, production, year) + npc = net_present_cost( + technologies, + prices, + capacity, + production, + consumption, + timeslice_level=timeslice_level, + ) crf = capital_recovery_factor(technologies) - return npc * broadcast_timeslice(crf, level=timeslice_level) + result = npc * broadcast_timeslice(crf, level=timeslice_level) + return result -def lifetime_levelized_cost_of_energy( +@cost +def levelized_cost_of_energy( technologies: xr.Dataset, prices: xr.DataArray, capacity: xr.DataArray, production: xr.DataArray, - year: int, - timeslice_level: Optional[str] = None, + consumption: xr.DataArray, + timeslice_level: str | None = None, + method: str = "lifetime", ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. It follows the `simplified LCOE` given by NREL. + .. seealso:: + :py:func:`capital_costs` + :py:func:`running_costs` + + Can calculate either a lifetime or annual LCOE. + - lifetime: the average cost per unit of production over the entire lifetime of the + technology. + Annual running costs and production are calculated for the full lifetime of the + technology, and adjusted to a present value using the discount rate. Total + costs (running costs over the lifetime + initial capital costs) are then divided + by total production to get the average cost per unit of production. + - annual: the average cost per unit of production in a single year. + Annual running costs and production are calculated for a single year. Capital + costs are multiplied by the capital recovery factor to get an annualized cost. + Total costs (annualized capital costs + running costs) are then divided by + production to get the average cost per unit of production. + Arguments: technologies: xr.Dataset of technology parameters prices: xr.DataArray with commodity prices capacity: xr.DataArray with the capacity of the relevant technologies - production: xr.DataArray with the production of the relevant technologies - year: int, the year of the forecast + production: xr.DataArray with commodity production by the relevant technologies + consumption: xr.DataArray with commodity consumption by the relevant + technologies timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + method: "lifetime" or "annual" Return: xr.DataArray with the LCOE calculated for the relevant technologies """ - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "cap_exp", - "var_par", - "var_exp", - "fix_par", - "fix_exp", - "fixed_outputs", - "fixed_inputs", - "flexible_inputs", - "utilization_factor", - ] - ] - - # Years - life = techs.technical_life.astype(int) - iyears = range(year, max(year + life.values.max(), year)) - years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") - - # Evolution of rates with time - rates = broadcast_timeslice( - discount_factor( - years=years - year + 1, - interest_rate=techs.interest_rate, - mask=years <= year + life, - ), - level=timeslice_level, - ) - - # Filters - environmentals = is_pollutant(technologies.comm_usage) - material = is_material(technologies.comm_usage) - products = is_enduse(technologies.comm_usage) - fuels = is_fuel(technologies.comm_usage) + if method not in ["lifetime", "annual"]: + raise ValueError("method must be either 'lifetime' or 'annual'.") - # Calculate consumption - cons = consumption( - technologies=techs, - production=production, - prices=prices, - timeslice_level=timeslice_level, - ) + # Capital costs (lifetime or annual depending on method) + _capital_costs = capital_costs(technologies, capacity, timeslice_level, method) - # Cost of installed capacity - installed_capacity_costs = distribute_timeslice( - techs.cap_par * (capacity**techs.cap_exp), level=timeslice_level - ) - - # Cost related to environmental products - prices_environmental = filter_input( - prices, commodity=environmentals, year=years.values - ) - environmental_costs = (production * prices_environmental * rates).sum( - ("commodity", "year") + # Running costs (annual) + _running_costs = running_costs( + technologies, prices, capacity, production, consumption, timeslice_level ) - # Fuel/energy costs - prices_fuel = filter_input(prices, commodity=fuels, year=years.values) - fuel_costs = (cons * prices_fuel * rates).sum(("commodity", "year")) - - # Cost related to material other than fuel/energy and environmentals - prices_material = filter_input(prices, commodity=material, year=years.values) - material_costs = (cons * prices_material * rates).sum(("commodity", "year")) - - # Fixed costs - fixed_costs = ( - distribute_timeslice( - techs.fix_par * (capacity**techs.fix_exp), level=timeslice_level - ) - * rates - ).sum("year") - - # Variable costs - tech_activity = ( - production.sel(commodity=products) - / broadcast_timeslice(techs.fixed_outputs, level=timeslice_level) - ).max("commodity") - variable_costs = ( - ( - broadcast_timeslice(techs.var_par, level=timeslice_level) - * tech_activity ** broadcast_timeslice(techs.var_exp, level=timeslice_level) - ) - * rates - ).sum("year") - - # Production + # Production (annual) + products = is_enduse(technologies.comm_usage) prod = ( production.where(production > 0.0, 1e-6) .sel(commodity=products) - .sum("commodity") + .sum( + "commodity" + ) # TODO: is this the correct way to deal with multiple products? ) - total_prod = (prod * rates).sum("year") - # LCOE - result = ( - installed_capacity_costs - + fuel_costs - + environmental_costs - + material_costs - + fixed_costs - + variable_costs - ) / total_prod + # If method is lifetime, have to adjust running costs and production + if method == "lifetime": + _running_costs = annual_to_lifetime( + _running_costs, technologies, timeslice_level + ) + prod = annual_to_lifetime(prod, technologies, timeslice_level) + # LCOE + result = (_capital_costs + _running_costs) / prod return result -def annual_levelized_cost_of_energy( - technologies: xr.Dataset, - prices: xr.DataArray, - interpolation: str = "linear", - fill_value: Union[int, str] = "extrapolate", - timeslice_level: Optional[str] = None, - **filters, -) -> xr.DataArray: - """Undiscounted levelized cost of energy (LCOE) of technologies on each given year. - - It mostly follows the `simplified LCOE`_ given by NREL. In the argument description, - we use the following: - - * [h]: hour - * [y]: year - * [$]: unit of currency - * [E]: unit of energy - * [1]: dimensionless - - Arguments: - technologies: Describe the technologies, with at least the following parameters: - * cap_par: [$/E] overnight capital cost - * interest_rate: [1] - * fix_par: [$/(Eh)] fixed costs of operation and maintenance costs - * var_par: [$/(Eh)] variable costs of operation and maintenance costs - * fixed_inputs: [1] == [(Eh)/(Eh)] ratio indicating the amount of commodity - consumed per units of energy created. - * fixed_outputs: [1] == [(Eh)/(Eh)] ration indicating the amount of - environmental pollutants produced per units of energy created. - prices: [$/(Eh)] the price of all commodities, including consumables and fuels. - This dataarray contains at least timeslice and commodity dimensions. - interpolation: interpolation method. - fill_value: Fill value for values outside the extrapolation range. - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - **filters: Anything by which prices can be filtered. - - Return: - The lifetime LCOE in [$/(Eh)] for each technology at each timeslice. - - .. _simplified LCOE: https://www.nrel.gov/analysis/tech-lcoe-documentation.html - """ - techs = technologies[ - [ - "technical_life", - "interest_rate", - "cap_par", - "var_par", - "fix_par", - "fixed_inputs", - "flexible_inputs", - "fixed_outputs", - "utilization_factor", - ] - ] - if "year" in techs.dims: - techs = techs.interp( - year=prices.year, method=interpolation, kwargs={"fill_value": fill_value} - ) - if filters is not None: - prices = prices.sel({k: v for k, v in filters.items() if k in prices.dims}) - techs = techs.sel({k: v for k, v in filters.items() if k in techs.dims}) - - assert {"timeslice", "commodity"}.issubset(prices.dims) - - life = techs.technical_life.astype(int) - - rates = techs.interest_rate / (1 - (1 + techs.interest_rate) ** (-life)) - - # Capital costs - annualized_capital_costs = distribute_timeslice( - techs.cap_par * rates, level=timeslice_level - ) / broadcast_timeslice(techs.utilization_factor, level=timeslice_level) - - # Fixed and variable running costs - o_and_e_costs = distribute_timeslice( - techs.fix_par + techs.var_par, level=timeslice_level - ) / broadcast_timeslice(techs.utilization_factor, level=timeslice_level) - - # Fuel costs from fixed and flexible inputs - fuel_costs = ( - distribute_timeslice(techs.fixed_inputs, level=timeslice_level) * prices - ).sum("commodity") - fuel_costs += ( - distribute_timeslice(techs.flexible_inputs, level=timeslice_level) * prices - ).sum("commodity") - - # Environmental costs - if "region" in techs.dims: - env_costs = ( - (distribute_timeslice(techs.fixed_outputs, level=timeslice_level) * prices) - .sel(region=techs.region) - .sel(commodity=is_pollutant(techs.comm_usage)) - .sum("commodity") - ) - else: - env_costs = ( - (distribute_timeslice(techs.fixed_outputs, level=timeslice_level) * prices) - .sel(commodity=is_pollutant(techs.comm_usage)) - .sum("commodity") - ) - return annualized_capital_costs + o_and_e_costs + env_costs + fuel_costs - - def supply_cost( - production: xr.DataArray, lcoe: xr.DataArray, asset_dim: Optional[str] = "asset" + production: xr.DataArray, lcoe: xr.DataArray, asset_dim: str | None = "asset" ) -> xr.DataArray: """Supply cost given production and the levelized cost of energy. @@ -470,8 +466,7 @@ def supply_cost( `muse.quantities.production`. lcoe: Levelized cost of energy for each good produced. In practice, it can be obtained from market prices via - `muse.costs.annual_levelized_cost_of_energy` or - `muse.costs.lifetime_levelized_cost_of_energy`. + `muse.costs.levelized_cost_of_energy`. asset_dim: Name of the dimension(s) holding assets, processes or technologies. """ data = xr.Dataset(dict(production=production, prices=production * lcoe)) @@ -503,9 +498,59 @@ def capital_recovery_factor(technologies: xr.Dataset) -> xr.DataArray: crf = technologies.interest_rate / ( 1 - (1 / (1 + technologies.interest_rate) ** nyears) ) + assert "year" not in crf.dims return crf -def discount_factor(years, interest_rate, mask=1.0): - """Calculate an array with the rate (aka discount factor) values over the years.""" - return mask / (1 + interest_rate) ** years +def annual_to_lifetime( + costs: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None +): + """Convert annual costs to lifetime costs. + + Costs are provided for a single year. These same costs are assumed to apply for the + full lifetime of the technologies, subject to a discount factor. The costs are then + summed over the lifetime of the technologies. + + Args: + costs: xr.DataArray of costs for a single year. + technologies: xr.Dataset of technology parameters + timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") + """ + assert "year" not in costs.dims + assert "year" not in technologies.dims + assert "timeslice" in costs.dims + life = technologies.technical_life.astype(int) + iyears = range(life.values.max()) + years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") + rates = discount_factor( + years=years, + interest_rate=technologies.interest_rate, + mask=years <= life, + ) + rates = broadcast_timeslice(rates, level=timeslice_level) + return (costs * rates).sum("year") + + +def discount_factor( + years: xr.DataArray, interest_rate: xr.DataArray, mask: xr.DataArray | None = None +): + """Calculate an array with of discount factor values over the years. + + Args: + years: xr.DataArray with the years counting from the present year + (i.e. current year = 0) + interest_rate: xr.DataArray with the interest rate for different technologies + mask: Optional mask to apply to the result (e.g. cutting to zero after the + technology lifetime) + """ + assert set(years.dims) == {"year"} + assert "year" not in interest_rate.dims + + # Calculate discount factor over the years + df = 1 / (1 + interest_rate) ** years + + # Apply mask + if mask is not None: + assert set(mask.dims) == set(interest_rate.dims) | {"year"} + df = df * mask + return df diff --git a/src/muse/objectives.py b/src/muse/objectives.py index 08a705f87..d395d75d4 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -71,7 +71,7 @@ def comfort( from muse.outputs.cache import cache_quantity from muse.registration import registrator from muse.timeslices import broadcast_timeslice, distribute_timeslice, drop_timeslice -from muse.utilities import check_dimensions, filter_input +from muse.utilities import check_dimensions OBJECTIVE_SIGNATURE = Callable[ [xr.Dataset, xr.DataArray, xr.DataArray, KwArg(Any)], xr.DataArray @@ -257,6 +257,7 @@ def consumption( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ) -> xr.DataArray: @@ -265,9 +266,21 @@ def consumption( Currently, the consumption is implemented for commodity_max == +infinity. """ from muse.quantities import consumption + from muse.timeslices import broadcast_timeslice, distribute_timeslice - result = consumption(technologies=technologies, prices=prices, production=demand) - return result.sum("commodity") + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) + ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) + return consump.sum("commodity") @register_objective @@ -290,10 +303,10 @@ def fixed_costs( :math:`\alpha` and :math:`\beta` are "fix_par" and "fix_exp" in :ref:`inputs-technodata`, respectively. """ - from muse.quantities import capacity_to_service_demand + from muse.costs import fixed_costs - capacity = capacity_to_service_demand(technologies=technologies, demand=demand) - result = technologies.fix_par * (capacity**technologies.fix_exp) + capacity = capacity_to_service_demand(technologies, demand) + result = fixed_costs(technologies, capacity).sum("timeslice") return result @@ -311,7 +324,10 @@ def capital_costs( :math:`\alpha` is "cap_exp". In other words, capital costs are constant across the simulation for each technology. """ - result = technologies.cap_par * (technologies.scaling_size**technologies.cap_exp) + from muse.costs import capital_costs + + capacity = capacity_to_service_demand(technologies, demand) + result = capital_costs(technologies, capacity, method="lifetime").sum("timeslice") result = xr.broadcast(result, demand.asset)[0] return result @@ -321,6 +337,7 @@ def emission_cost( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ) -> xr.DataArray: @@ -336,15 +353,16 @@ def emission_cost( with :math:`s` the timeslices and :math:`c` the commodity. """ - from muse.commodities import is_enduse, is_pollutant + from muse.costs import environmental_costs - enduses = is_enduse(technologies.comm_usage.sel(commodity=demand.commodity)) - total = demand.sel(commodity=enduses).sum("commodity") - envs = is_pollutant(technologies.comm_usage) - prices = filter_input(prices, year=demand.year.item(), commodity=envs) - return total * (distribute_timeslice(technologies.fixed_outputs) * prices).sum( - "commodity" + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + result = environmental_costs(technologies, prices, production) + return result @register_objective @@ -352,17 +370,29 @@ def fuel_consumption_cost( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ): """Cost of fuels when fulfilling whole demand.""" - from muse.commodities import is_fuel + from muse.costs import fuel_costs from muse.quantities import consumption + from muse.timeslices import broadcast_timeslice, distribute_timeslice - commodity = is_fuel(technologies.comm_usage.sel(commodity=demand.commodity)) - fcons = consumption(technologies=technologies, prices=prices, production=demand) - prices = filter_input(prices, year=demand.year.item(), commodity=commodity) - return (fcons * prices).sum("commodity") + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) + ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) + result = fuel_costs(technologies, prices, consump) + return result @register_objective(name=["ALCOE"]) @@ -370,6 +400,7 @@ def annual_levelized_cost_of_energy( technologies: xr.Dataset, demand: xr.DataArray, prices: xr.DataArray, + timeslice_level: Optional[str] = None, *args, **kwargs, ): @@ -381,14 +412,33 @@ def annual_levelized_cost_of_energy( See :py:func:`muse.costs.annual_levelized_cost_of_energy` for more details. """ - from muse.costs import annual_levelized_cost_of_energy as aLCOE + from muse.costs import levelized_cost_of_energy as LCOE + from muse.quantities import consumption - result = filter_input( - aLCOE(technologies=technologies, prices=prices).max("timeslice"), - year=demand.year.item(), + capacity = capacity_to_service_demand(technologies, demand) + production = ( + broadcast_timeslice(capacity, level=timeslice_level) + * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) + * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) - result = xr.broadcast(result, demand.asset)[0] - return result + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) + + results = LCOE( + technologies=technologies, + prices=prices, + capacity=capacity, + production=production, + consumption=consump, + timeslice_level=timeslice_level, + method="annual", + ) + + return results.where(np.isfinite(results)).fillna(0.0) @register_objective(name=["LCOE", "LLCOE"]) @@ -407,8 +457,8 @@ def lifetime_levelized_cost_of_energy( The LCOE is set to zero for those timeslices where the production is zero, normally due to a zero utilisation factor. """ - from muse.costs import lifetime_levelized_cost_of_energy as LCOE - from muse.quantities import capacity_to_service_demand + from muse.costs import levelized_cost_of_energy as LCOE + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand( technologies=technologies, demand=demand, timeslice_level=timeslice_level @@ -418,14 +468,21 @@ def lifetime_levelized_cost_of_energy( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = LCOE( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), + consumption=consump, timeslice_level=timeslice_level, + method="lifetime", ) return results.where(np.isfinite(results)).fillna(0.0) @@ -445,7 +502,7 @@ def net_present_value( See :py:func:`muse.costs.net_present_value` for more details. """ from muse.costs import net_present_value as NPV - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -453,13 +510,19 @@ def net_present_value( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = NPV( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), + consumption=consump, timeslice_level=timeslice_level, ) return results @@ -479,7 +542,7 @@ def net_present_cost( See :py:func:`muse.costs.net_present_cost` for more details. """ from muse.costs import net_present_cost as NPC - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -487,13 +550,19 @@ def net_present_cost( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = NPC( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), + consumption=consump, ) return results @@ -512,7 +581,7 @@ def equivalent_annual_cost( See :py:func:`muse.costs.equivalent_annual_cost` for more details. """ from muse.costs import equivalent_annual_cost as EAC - from muse.quantities import capacity_to_service_demand + from muse.quantities import capacity_to_service_demand, consumption capacity = capacity_to_service_demand(technologies=technologies, demand=demand) production = ( @@ -520,13 +589,19 @@ def equivalent_annual_cost( * distribute_timeslice(technologies.fixed_outputs, level=timeslice_level) * broadcast_timeslice(technologies.utilization_factor, level=timeslice_level) ) + consump = consumption( + technologies=technologies, + prices=prices, + production=production, + timeslice_level=timeslice_level, + ) results = EAC( technologies=technologies, prices=prices, capacity=capacity, production=production, - year=demand.year.item(), + consumption=consump, timeslice_level=timeslice_level, ) return results diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py index 7d9284daf..cec60ffec 100644 --- a/src/muse/outputs/mca.py +++ b/src/muse/outputs/mca.py @@ -414,7 +414,7 @@ def metric_lcoe( def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame: """Levelized cost of energy () of technologies over their lifetime.""" - from muse.costs import lifetime_levelized_cost_of_energy as LCOE + from muse.costs import levelized_cost_of_energy as LCOE from muse.quantities import capacity_to_service_demand # Filtering of the inputs @@ -453,13 +453,17 @@ def sector_lcoe(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Data * distribute_timeslice(techs.fixed_outputs) * techs.utilization_factor ) + consump = consumption( + technologies=technologies, prices=prices, production=production + ) result = LCOE( prices=prices, technologies=techs, capacity=capacity, production=production, - year=agent.year, + consumption=consump, + method="lifetime", ) data_agent = result diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 23ce7e409..4d639413f 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -583,6 +583,8 @@ def production_amplitude( DataArray with production amplitudes for each technology in each timeslice. Will have the same dimensions as `production`, minus the `commodity` dimension. """ + assert set(technologies.dims).issubset(set(production.dims)) + return ( production / broadcast_timeslice(technologies.fixed_outputs, level=timeslice_level) diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 26e721606..79f15b1ad 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -289,7 +289,7 @@ def save_outputs(self) -> None: def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: """Computes resulting market: production, consumption, and costs.""" from muse.commodities import is_pollutant - from muse.costs import annual_levelized_cost_of_energy, supply_cost + from muse.costs import levelized_cost_of_energy, supply_cost from muse.quantities import consumption from muse.utilities import broadcast_techs @@ -306,18 +306,29 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: # Calculate consumption consume = consumption( - technologies, supply, market.prices, timeslice_level=self.timeslice_level + technologies, + production=supply, + prices=market.prices, + timeslice_level=self.timeslice_level, ) - # Calculate commodity prices + # Calculate LCOE + # We select data for the second year, which corresponds to the investment year technodata = cast(xr.Dataset, broadcast_techs(technologies, supply)) + lcoe = levelized_cost_of_energy( + prices=market.prices.sel(region=supply.region).isel(year=1), + technologies=technodata, + capacity=capacity.isel(year=1), + production=supply.isel(year=1), + consumption=consume.isel(year=1), + timeslice_level=self.timeslice_level, + method="annual", + ) + + # Calculate new commodity prices costs = supply_cost( supply.where(~is_pollutant(supply.comm_usage), 0), - annual_levelized_cost_of_energy( - prices=market.prices.sel(region=supply.region), - technologies=technodata, - timeslice_level=self.timeslice_level, - ), + lcoe, asset_dim="asset", ) diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 5d4fbe222..0a20fcc39 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -2,56 +2,41 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index f447aa61e..25a14a2a1 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.37740000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.37740000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.93960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43650000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43650000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43650000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43650000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43650000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43650000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.41720000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46830000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,15.92890000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.41720000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.61930000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.41720000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46830000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,15.92890000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.41720000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.61930000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.41720000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46830000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.41720000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46830000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.70070000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48720000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.28540000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.70070000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48720000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.52360000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.70070000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48720000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.28540000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.70070000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48720000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.52360000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.70070000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48720000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.70070000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48720000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.64270000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.10180000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51400000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.04320000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.10180000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51400000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.69540000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.10180000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51400000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,16.04320000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.10180000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51400000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.69540000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.10180000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51400000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.10180000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51400000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.02160000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.50400000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.54080000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.44410000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.50400000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.54080000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.62940000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.50400000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.54080000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.44410000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.50400000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.54080000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.62940000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.50400000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.54080000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.50400000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.54080000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.72200000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index bd65fa315..d81760203 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -2,56 +2,41 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 -A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025 -A1,7.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2025 -A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2025 -A1,19.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030 +A1,24.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2025 +A1,19.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2030 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2030 -A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2030 -A1,11.62600000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,retrofit,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2035 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2035 -A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2035 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2035 +A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2035 +A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2040 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2040 -A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 +A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2040 +A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2040 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2045 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2045 -A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 +A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2045 +A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2045 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 -A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2050 -A1,5.88890000000,R1,2025,R1,power,gasCCGT,retrofit,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 +A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2050 +A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 -A1,7.91410000000,R1,2045,R1,power,windturbine,retrofit,2050 -A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2050 -A1,9.22000000000,R1,2025,R1,gas,gassupply1,retrofit,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index bbd8be713..89d70fbf7 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.34640000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.34640000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62450000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.34640000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.34640000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62450000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.34640000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62450000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.34640000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62450000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.90250000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43400000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.90250000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43400000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.90250000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43400000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.90250000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43400000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.90250000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43400000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.90250000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43400000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.38650000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46630000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.38650000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46630000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.38650000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46630000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.38650000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46630000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.38650000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46630000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.38650000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46630000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.73210000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48930000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.73210000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48930000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.73210000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48930000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.73210000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48930000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.73210000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48930000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.73210000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48930000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.19980000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.52050000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.19980000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.52050000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.19980000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.52050000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.19980000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.52050000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.19980000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.52050000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.19980000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.52050000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.56350000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.54470000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.56350000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.54470000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.56350000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.54470000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.56350000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.54470000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.56350000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.54470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.56350000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.54470000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 96be5b043..1fef9b401 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,0.91100000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.56480000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,0.91100000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.56480000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,0.91100000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.56480000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,12.62770000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.46720000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,0.91100000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.56480000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,0.91100000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.56480000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,0.91100000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.56480000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,7.40420000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,6.90620000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,0.66670000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.28490000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,0.66670000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.28490000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,0.66670000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.28490000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,0.66670000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.28490000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,0.66670000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.28490000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,0.66670000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.28490000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index e192c6924..2958af3a8 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -3,62 +3,62 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 -A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,25.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 +A1,28.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 -A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 -A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,17.83930000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 +A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,21.33720000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 -A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 -A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 -A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 +A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 -A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 -A1,16.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,4.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,4.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A1,17.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,11.96740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,6.66670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 3ee3488c5..646a3c9aa 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,2.42260000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,1.12700000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.11600000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58960000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,2.42260000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,1.12700000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,25.07480000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.97120000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,2.42260000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,1.12700000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,29.11600000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58960000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,2.42260000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,1.12700000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,25.07480000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.97120000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,2.42260000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,1.12700000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,21.96620000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.35280000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,2.42260000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,1.12700000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,23.05420000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.66200000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,2.98680000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.95680000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.96890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,2.98680000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.95680000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.81250000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,2.98680000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.95680000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.96890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,2.98680000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.95680000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.81250000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,2.98680000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.95680000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,7.65610000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,2.98680000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.95680000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,9.73430000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,3.19280000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,1.02520000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,28.33300000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.32880000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,3.19280000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,1.02520000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.88870000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,3.19280000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,1.02520000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,28.33300000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.32880000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,3.19280000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,1.02520000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.88870000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,3.19280000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,1.02520000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,3.19280000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,1.02520000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.16650000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,3.05660000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.44430000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,28.57110000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.66220000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,3.05660000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.44430000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.04740000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.44150000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,3.05660000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.44430000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,28.57110000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.66220000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,3.05660000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.44430000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.04740000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.44150000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,3.05660000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.44430000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,3.05660000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.44430000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.28550000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,7.83110000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,3.29010000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.45980000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,28.74960000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,15.75740000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,3.29010000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.45980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.16640000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.50500000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,3.29010000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.45980000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,28.74960000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,15.75740000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,3.29010000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.45980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.16640000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.50500000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,3.29010000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.45980000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,3.29010000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.45980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.37480000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,7.87870000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,3.52320000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.47540000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,28.88850000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,15.82890000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,0.31920000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,3.52320000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.47540000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.25900000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.55260000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,0.31920000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,3.52320000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.47540000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,28.88850000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,15.82890000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,0.31920000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,3.52320000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.47540000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.25900000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.55260000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,0.31920000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,3.52320000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.47540000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,0.31920000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,3.52320000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.47540000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.44430000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,7.91440000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,0.31920000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 31ec35621..0a01a70cd 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -14,96 +14,96 @@ ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,131.07760000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,393.66450000000,R1,0,MUS$2010/Mt,2015 fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,131.07760000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,393.23270000000,R1,1,MUS$2010/Mt,2015 fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,131.07760000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,393.66450000000,R1,2,MUS$2010/Mt,2015 fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,138.74760000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,416.67530000000,R1,0,MUS$2010/Mt,2020 fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,138.74760000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,416.24270000000,R1,1,MUS$2010/Mt,2020 fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,138.74760000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,416.67530000000,R1,2,MUS$2010/Mt,2020 fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,157.12090000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,471.79630000000,R1,0,MUS$2010/Mt,2025 fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,157.12090000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,471.36280000000,R1,1,MUS$2010/Mt,2025 fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,157.12090000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,471.79630000000,R1,2,MUS$2010/Mt,2025 fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,175.32120000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,526.39780000000,R1,0,MUS$2010/Mt,2030 fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,175.32120000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,525.96350000000,R1,1,MUS$2010/Mt,2030 fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,175.32120000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,526.39780000000,R1,2,MUS$2010/Mt,2030 fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,165.03960000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,495.55460000000,R1,0,MUS$2010/Mt,2035 fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,165.03960000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,495.11890000000,R1,1,MUS$2010/Mt,2035 fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,165.03960000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,495.55460000000,R1,2,MUS$2010/Mt,2035 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,154.56700000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,464.13770000000,R1,0,MUS$2010/Mt,2040 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,154.56700000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,463.70110000000,R1,1,MUS$2010/Mt,2040 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,154.56700000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,464.13770000000,R1,2,MUS$2010/Mt,2040 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,153.83350000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,461.93710000000,R1,0,MUS$2010/Mt,2045 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,153.83350000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,461.50050000000,R1,1,MUS$2010/Mt,2045 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,153.83350000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,461.93710000000,R1,2,MUS$2010/Mt,2045 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,153.09170000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,459.71170000000,R1,0,MUS$2010/Mt,2050 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,153.09170000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,459.27510000000,R1,1,MUS$2010/Mt,2050 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,153.09170000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,459.71170000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index 5d8535537..fcffde024 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -3,68 +3,56 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 -A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 -A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 -A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 +A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 -A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,9.40560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index b2f3d4bcb..23c05a431 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,2.37740000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.62610000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,2.37740000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.62610000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,2.37740000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.62610000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,2.37740000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.62610000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,2.37740000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.62610000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,2.37740000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.62610000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,2.93960000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.43650000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,27.27240000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.06990000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,2.93960000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.43650000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.18160000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.81590000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,2.93960000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.43650000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,27.27240000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.06990000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,2.93960000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.43650000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.18160000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.81590000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,2.93960000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.43650000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,2.93960000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.43650000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,13.63620000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.68880000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,3.41720000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.46830000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,29.59240000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,16.77770000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,3.41720000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.46830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.72830000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.53230000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,3.41720000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.46830000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,29.59240000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,16.77770000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,3.41720000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.46830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.72830000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.53230000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,3.41720000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.46830000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.32830000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,3.41720000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.46830000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.79620000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.40970000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,3.65230000000,R1,0,MUS$2010/PJ,2040 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,0.48400000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,29.66560000000,R1,0,MUS$2010/PJ,2040 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,17.48300000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,3.65230000000,R1,1,MUS$2010/PJ,2040 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,0.48400000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,19.77710000000,R1,1,MUS$2010/PJ,2040 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.06660000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,3.65230000000,R1,2,MUS$2010/PJ,2040 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,0.48400000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,29.66560000000,R1,2,MUS$2010/PJ,2040 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,17.48300000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,3.65230000000,R1,3,MUS$2010/PJ,2040 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,0.48400000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,19.77710000000,R1,3,MUS$2010/PJ,2040 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.06660000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,3.65230000000,R1,4,MUS$2010/PJ,2040 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,0.48400000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.68550000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,3.65230000000,R1,5,MUS$2010/PJ,2040 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,0.48400000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.83280000000,R1,5,MUS$2010/PJ,2040 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.85840000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,4.10180000000,R1,0,MUS$2010/PJ,2045 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,0.51400000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,16.19530000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,4.10180000000,R1,1,MUS$2010/PJ,2045 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,0.51400000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,10.79690000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,4.10180000000,R1,2,MUS$2010/PJ,2045 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,0.51400000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,16.19530000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,4.10180000000,R1,3,MUS$2010/PJ,2045 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,0.51400000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,10.79690000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.10180000000,R1,4,MUS$2010/PJ,2045 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,0.51400000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,4.10180000000,R1,5,MUS$2010/PJ,2045 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,0.51400000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.09760000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,4.45150000000,R1,0,MUS$2010/PJ,2050 -gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,0.53730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,4.45150000000,R1,1,MUS$2010/PJ,2050 -gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,0.53730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,4.45150000000,R1,2,MUS$2010/PJ,2050 -gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,0.53730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,4.45150000000,R1,3,MUS$2010/PJ,2050 -gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,0.53730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.45150000000,R1,4,MUS$2010/PJ,2050 -gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,0.53730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,4.45150000000,R1,5,MUS$2010/PJ,2050 -gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,0.53730000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index a9ef8e426..df717c78a 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,2.29980000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,2.37690000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.78380000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,0.93720000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,2.29980000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,2.37690000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.78380000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,0.93720000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,2.29980000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,2.37690000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.78380000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,0.93720000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,2.29980000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,2.37690000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.78380000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,0.93720000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,2.29980000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,2.37690000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.78380000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,0.93720000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,2.29980000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,2.37690000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.78380000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,0.93720000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,1.33800000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,1.44120000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.46420000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,0.56420000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,1.33800000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,1.44120000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.46420000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,0.56420000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,1.33800000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,1.44120000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.46420000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,0.56420000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,1.33800000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,1.44120000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.46420000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,0.56420000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,1.33800000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,1.44120000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.46420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,0.56420000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,1.33800000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,1.44120000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.46420000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,0.56420000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,19.56940000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,19.56940000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,1.01070000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,1.12280000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.35550000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,0.43730000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.56940000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.56940000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,1.01070000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,1.12280000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.35550000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,0.43730000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.56940000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,19.56940000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,1.01070000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,1.12280000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.35550000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,0.43730000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.56940000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.56940000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,1.01070000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,1.12280000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.35550000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,0.43730000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,19.56940000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,19.56940000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,1.01070000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,1.12280000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.35550000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,0.43730000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,19.56940000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,19.56940000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,1.01070000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,1.12280000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.35550000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,0.43730000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,23.60400000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,114.76360000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,23.36440000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,174.63580000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,19.95270000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,105.34210000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,19.80280000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,159.98100000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,22.89470000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,126.27890000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,22.67250000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,192.54730000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,22.89470000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,126.27890000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,22.67250000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,192.54730000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,19.27370000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,101.24580000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,19.14060000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,153.60930000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,22.92520000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,126.27890000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,22.70220000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,192.54730000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,32.84270000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,163.53120000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,34.10390000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,245.46200000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,27.36570000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,149.94900000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,28.42040000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,224.74900000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,31.77870000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,180.13170000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,32.99980000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,270.77800000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,31.77870000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,180.13170000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,32.99980000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,270.77800000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,26.34730000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,144.04360000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,27.36360000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,215.74330000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,31.82450000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,180.13170000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,33.04730000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,270.77800000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8685.55900000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,8685.55900000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,46.70080000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,215.11500000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,50.20940000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,327.13430000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7800.08140000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7800.08140000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,38.48530000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,197.25240000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,41.34410000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,299.56730000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,9566.88680000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,9566.88680000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,45.10480000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,236.94710000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,48.48720000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,360.82720000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,9566.88680000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,9566.88680000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,45.10480000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,236.94710000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,48.48720000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,360.82720000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7450.38850000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7450.38850000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,36.95770000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,189.48610000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,39.69570000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,287.58170000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,9568.07120000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,9568.07120000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,45.17340000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,236.94710000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,48.56120000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,360.82720000000,R2,5,MUS$2010/PJ,2035 diff --git a/tests/test_costs.py b/tests/test_costs.py index 1099e2312..3369a4fb4 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -1,106 +1,272 @@ -from pytest import fixture +from numpy import isclose +from pytest import fixture, mark + +YEAR = 2030 + +"""Expected dimensions for the output data of the cost functions. + +This should be the same for all cost functions. In general, this is the sum of all +dimensions from the input data, minus "commodity", plus "timeslice" (if not already +present). +""" +EXPECTED_DIMS = {"asset", "region", "technology", "timeslice"} @fixture def _prices(market): prices = market.prices - return prices + return prices.sel(year=YEAR) @fixture -def _capacity(technologies, demand_share): +def _technologies(technologies): + return technologies.sel(year=YEAR) + + +@fixture +def _capacity(_technologies, demand_share): from muse.quantities import capacity_to_service_demand capacity = capacity_to_service_demand( - technologies=technologies, demand=demand_share + technologies=_technologies, demand=demand_share ) return capacity @fixture -def _production(technologies, _capacity): +def _production(_technologies, _capacity): from muse.timeslices import broadcast_timeslice, distribute_timeslice production = ( broadcast_timeslice(_capacity) - * distribute_timeslice(technologies.fixed_outputs) - * broadcast_timeslice(technologies.utilization_factor) + * distribute_timeslice(_technologies.fixed_outputs) + * broadcast_timeslice(_technologies.utilization_factor) ) return production -def test_fixtures(technologies, _prices, _capacity, _production): +@fixture +def _consumption(_technologies, _capacity): + from muse.timeslices import broadcast_timeslice, distribute_timeslice + + consumption = ( + broadcast_timeslice(_capacity) + * distribute_timeslice(_technologies.fixed_inputs) + * broadcast_timeslice(_technologies.utilization_factor) + ) + return consumption + + +def test_fixtures(_technologies, _prices, _capacity, _production, _consumption): """Validating that the fixtures have appropriate dimensions.""" - assert set(technologies.dims) == {"commodity", "region", "technology", "year"} - assert set(_prices.dims) == {"commodity", "region", "timeslice", "year"} - assert set(_capacity.dims) == {"asset", "region", "technology", "year"} - assert set(_production.dims) == { - "asset", - "commodity", - "region", - "technology", - "timeslice", - "year", - } + assert set(_technologies.dims) == {"commodity", "region", "technology"} + assert set(_prices.dims) == {"commodity", "region", "timeslice"} + assert set(_capacity.dims) == {"asset", "region", "technology"} + assert ( + set(_production.dims) + == set(_consumption.dims) + == { + "asset", + "commodity", + "region", + "technology", + "timeslice", + } + ) + + +def test_capital_costs(_technologies, _capacity): + from muse.costs import capital_costs + + result = capital_costs(_technologies, _capacity) + assert set(result.dims) == EXPECTED_DIMS + + +def test_environmental_costs(_technologies, _prices, _production): + from muse.costs import environmental_costs + + result = environmental_costs(_technologies, _prices, _production) + assert set(result.dims) == EXPECTED_DIMS + + +def test_fuel_costs(_technologies, _prices, _consumption): + from muse.costs import fuel_costs + + result = fuel_costs(_technologies, _prices, _consumption) + assert set(result.dims) == EXPECTED_DIMS + + +def test_material_costs(_technologies, _prices, _consumption): + from muse.costs import material_costs + + result = material_costs(_technologies, _prices, _consumption) + assert set(result.dims) == EXPECTED_DIMS + + +def test_fixed_costs(_technologies, _capacity): + from muse.costs import fixed_costs + + result = fixed_costs(_technologies, _capacity) + assert set(result.dims) == EXPECTED_DIMS + +def test_variable_costs(_technologies, _production): + from muse.costs import variable_costs -def test_net_present_value(technologies, _prices, _capacity, _production, year=2030): + result = variable_costs(_technologies, _production) + assert set(result.dims) == EXPECTED_DIMS + + +def test_running_costs(_technologies, _prices, _capacity, _production, _consumption): + from muse.costs import running_costs + + result = running_costs(_technologies, _prices, _capacity, _production, _consumption) + assert set(result.dims) == EXPECTED_DIMS + + +def test_net_present_value( + _technologies, _prices, _capacity, _production, _consumption +): from muse.costs import net_present_value - result = net_present_value(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = net_present_value( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == EXPECTED_DIMS -def test_net_present_cost(technologies, _prices, _capacity, _production, year=2030): +def test_net_present_cost(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import net_present_cost - result = net_present_cost(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = net_present_cost( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == EXPECTED_DIMS def test_equivalent_annual_cost( - technologies, _prices, _capacity, _production, year=2030 + _technologies, _prices, _capacity, _production, _consumption ): from muse.costs import equivalent_annual_cost - result = equivalent_annual_cost(technologies, _prices, _capacity, _production, year) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + result = equivalent_annual_cost( + _technologies, _prices, _capacity, _production, _consumption + ) + assert set(result.dims) == EXPECTED_DIMS -def test_lifetime_levelized_cost_of_energy( - technologies, _prices, _capacity, _production, year=2030 +@mark.parametrize("method", ["annual", "lifetime"]) +def test_levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method ): - from muse.costs import lifetime_levelized_cost_of_energy + from muse.costs import levelized_cost_of_energy - result = lifetime_levelized_cost_of_energy( - technologies, _prices, _capacity, _production, year + result = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert set(result.dims) == {"asset", "region", "technology", "timeslice", "year"} + assert set(result.dims) == EXPECTED_DIMS -def test_annual_levelized_cost_of_energy(technologies, _prices): - from muse.costs import annual_levelized_cost_of_energy +def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): + from muse.costs import levelized_cost_of_energy, supply_cost - result = annual_levelized_cost_of_energy(technologies, _prices) - assert set(result.dims) == {"region", "technology", "timeslice", "year"} - - -def test_supply_cost(_production, _prices, technologies): - from muse.costs import annual_levelized_cost_of_energy, supply_cost - - lcoe = annual_levelized_cost_of_energy(technologies, _prices) + lcoe = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method="annual" + ) result = supply_cost(_production, lcoe) assert set(result.dims) == { "commodity", "region", "technology", "timeslice", - "year", } -def test_capital_recovery_factor(technologies): +def test_capital_recovery_factor(_technologies): from muse.costs import capital_recovery_factor - result = capital_recovery_factor(technologies) - assert set(result.dims) == {"region", "technology", "year"} + result = capital_recovery_factor(_technologies) + assert set(result.dims) == set(_technologies.interest_rate.dims) + # {"region", "technology"} + + +def test_annual_to_lifetime(_technologies, _prices, _consumption): + from muse.costs import annual_to_lifetime, fuel_costs + + _fuel_costs = fuel_costs(_technologies, _prices, _consumption) + _fuel_costs_lifetime = annual_to_lifetime(_fuel_costs, _technologies) + assert set(_fuel_costs.dims) == set(_fuel_costs_lifetime.dims) + assert (_fuel_costs_lifetime > _fuel_costs).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_flow_scaling( + _technologies, _prices, _capacity, _production, _consumption, method +): + """Testing that LCOE is independent of input/output flow scaling. + + In other words, if we change technology flows by a constant factor, the LCOE (which + is a cost per unit of production) should remain unchanged. + + This is a bit more complicated if the variable costs are nonlinear, so we'll set + the exponent to 1 for simplicity. + """ + from muse.costs import levelized_cost_of_energy + + _technologies["var_exp"] = 1 + + # LCOE with original inputs + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + + # Scale inputs and outputs by a constant factor -> LCOE should be unchanged + # var_par also needs to be scaled as this relates to units of technology + # activity, not units of commodity consumption/production + _technologies_scaled = _technologies.copy() + _technologies_scaled["fixed_inputs"] = _technologies["fixed_inputs"] * 2 + _technologies_scaled["flexible_inpits"] = _technologies["flexible_inputs"] * 2 + _technologies_scaled["fixed_outputs"] = _technologies["fixed_outputs"] * 2 + _technologies_scaled["var_par"] = _technologies["var_par"] * 2 + lcoe2 = levelized_cost_of_energy( + _technologies_scaled, + _prices, + _capacity, + _production, + _consumption, + method=method, + ) + assert isclose(lcoe1, lcoe2).all() + + +@mark.parametrize("method", ["annual", "lifetime"]) +def test_lcoe_prod_scaling( + _technologies, _prices, _capacity, _production, _consumption, method +): + """Testing that LCOE is independent of production scaling. + + If all costs are linear (exponents = 1), then the LCOE should be independent of + production as long as production, consumption, and capacity are scaled together. + """ + from muse.costs import levelized_cost_of_energy + + _technologies["var_exp"] = 1 + _technologies["cap_exp"] = 1 + _technologies["fix_exp"] = 1 + + # LCOE with original inputs + lcoe1 = levelized_cost_of_energy( + _technologies, _prices, _capacity, _production, _consumption, method=method + ) + + # Scale consumption, production, and capacity by a constant factor -> LCOE + # should be unchanged + lcoe2 = levelized_cost_of_energy( + _technologies, + _prices, + _capacity * 2, + _production * 2, + _consumption * 2, + method=method, + ) + assert isclose(lcoe1, lcoe2).all() diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 5727df2d2..31db80af9 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -179,7 +179,7 @@ def test_annual_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import annual_levelized_cost_of_energy result = annual_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset"} + assert set(result.dims) == {"replacement", "asset", "timeslice"} def test_lifetime_levelized_cost_of_energy(_technologies, _demand, _prices): From df5a21e01c9a8b18831c2fcc942ac57b48e41836 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 18 Dec 2024 14:03:26 +0000 Subject: [PATCH 2/5] Calculate LCOE at the annual level --- src/muse/costs.py | 123 ++++++++++++++----------------------- src/muse/objectives.py | 8 +-- src/muse/quantities.py | 10 ++- src/muse/sectors/sector.py | 10 ++- tests/test_costs.py | 35 +++++------ tests/test_objectives.py | 10 +-- 6 files changed, 78 insertions(+), 118 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index cd247af48..b349729b5 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -6,7 +6,6 @@ - capacity: xr.DataArray with the capacity of the technologies - production: xr.DataArray with commodity production by the technologies - consumption: xr.DataArray with commodity consumption by the technologies -- timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") - method: "lifetime" or "annual" Data should only be provided for a single year (i.e. no "year" dimension in any of the @@ -14,10 +13,6 @@ (i.e. have a "timeslice" dimension). Technology parameters may also be specified at the timeslice level, but capacity should not be. -`timeslice_level` is given as an argument to some functions, but in this case it must -match the timeslice level of any timesliced inputs, so is generally not configurable, -but only included to ensure consistency and provide explicitness. - The `technologies` input will usually contain data for multiple technologies and have a "technology" dimension (sometimes called "asset" or "replacement"). In this case, it's important that the `capacity`, `production`, and `consumption` inputs have a @@ -29,13 +24,13 @@ unwanted broadcasting. The dimensions of the output will be the sum of all dimensions from the input data, -minus "commodity", plus "timeslice" (if not already present). +minus "commodity". Some functions have a `method` argument, which can be "annual" or "lifetime": Costs can either be annual or lifetime: -- annual: calculates the cost for each timeslice in a single year -- lifetime: calculates the total cost in each timeslice over the lifetime of the +- annual: calculates the cost in a single year +- lifetime: calculates the total cost over the lifetime of the technology, using the `technical_life` attribute from the `technologies` dataset. - In this case, technology parameters, production, consumption, capacity and prices are assumed to be constant over the lifetime of the technology. The cost in each @@ -58,7 +53,6 @@ from muse.commodities import is_enduse, is_fuel, is_material, is_pollutant from muse.quantities import production_amplitude -from muse.timeslices import broadcast_timeslice, distribute_timeslice from muse.utilities import filter_input @@ -69,7 +63,6 @@ def cost(func): def wrapper(*args, **kwargs): result = func(*args, **kwargs) assert "year" not in result.dims - assert "timeslice" in result.dims return result return wrapper @@ -79,7 +72,6 @@ def wrapper(*args, **kwargs): def capital_costs( technologies: xr.Dataset, capacity: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ): """Calculate capital costs for the relevant technologies. @@ -91,20 +83,15 @@ def capital_costs( - lifetime: returns the full capital costs - annual: total capital costs are multiplied by the capital recovery factor to get annualized costs - - Costs are distributed uniformly over timeslices, with the timeslice level specified """ if method not in ["lifetime", "annual"]: raise ValueError("method must be either 'lifetime' or 'annual'.") - _capital_costs = distribute_timeslice( - technologies.cap_par * (capacity**technologies.cap_exp), level=timeslice_level - ) + _capital_costs = technologies.cap_par * (capacity**technologies.cap_exp) if method == "annual": crf = capital_recovery_factor(technologies) - _capital_costs = _capital_costs * broadcast_timeslice( - crf, level=timeslice_level - ) + _capital_costs = _capital_costs * crf + assert "timeslice" not in _capital_costs.dims return _capital_costs @@ -119,7 +106,9 @@ def environmental_costs( """ environmentals = is_pollutant(technologies.comm_usage) prices_environmental = filter_input(prices, commodity=environmentals) - return (production * prices_environmental).sum("commodity") + result = (production * prices_environmental).sum("commodity") + assert "timeslice" in result.dims + return result @cost @@ -133,7 +122,9 @@ def fuel_costs( """ fuels = is_fuel(technologies.comm_usage) prices_fuel = filter_input(prices, commodity=fuels) - return (consumption * prices_fuel).sum("commodity") + result = (consumption * prices_fuel).sum("commodity") + assert "timeslice" in result.dims + return result @cost @@ -147,31 +138,27 @@ def material_costs( """ material = is_material(technologies.comm_usage) prices_material = filter_input(prices, commodity=material) - return (consumption * prices_material).sum("commodity") + result = (consumption * prices_material).sum("commodity") + assert "timeslice" in result.dims + return result @cost -def fixed_costs( - technologies: xr.Dataset, capacity: xr.DataArray, timeslice_level: str | None = None -) -> xr.DataArray: +def fixed_costs(technologies: xr.Dataset, capacity: xr.DataArray) -> xr.DataArray: """Calculate annual fixed costs for the relevant technologies. This is the fixed running cost over the course of a year corresponding to the `fix_par` and `fix_exp` technology parameters. - - This cost is scaled by the capacity of the technology and distributed uniformly - over the timeslices, with the timeslice level specified """ - return distribute_timeslice( - technologies.fix_par * (capacity**technologies.fix_exp), level=timeslice_level - ) + result = technologies.fix_par * (capacity**technologies.fix_exp) + assert "timeslice" not in result.dims + return result @cost def variable_costs( technologies: xr.Dataset, production: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Calculate annual variable costs for the relevant technologies. @@ -182,12 +169,9 @@ def variable_costs( in each timeslice based on `production`. This is then used to scale the variable costs. """ - tech_activity = production_amplitude(production, technologies, timeslice_level) - result = broadcast_timeslice( - technologies.var_par, level=timeslice_level - ) * tech_activity ** broadcast_timeslice( - technologies.var_exp, level=timeslice_level - ) + tech_activity = production_amplitude(production, technologies).sum("timeslice") + result = technologies.var_par * tech_activity**technologies.var_exp + assert "timeslice" not in result.dims return result @@ -198,7 +182,6 @@ def running_costs( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Total annual running costs (excluding capital costs). @@ -214,17 +197,18 @@ def running_costs( _environmental_costs = environmental_costs(technologies, prices, production) _fuel_costs = fuel_costs(technologies, prices, consumption) _material_costs = material_costs(technologies, prices, consumption) - _fixed_costs = fixed_costs(technologies, capacity, timeslice_level) - _variable_costs = variable_costs(technologies, production, timeslice_level) + _fixed_costs = fixed_costs(technologies, capacity) + _variable_costs = variable_costs(technologies, production) # Total running costs result = ( - _environmental_costs - + _fuel_costs - + _material_costs + _environmental_costs.sum("timeslice") + + _fuel_costs.sum("timeslice") + + _material_costs.sum("timeslice") + _fixed_costs + _variable_costs ) + assert "timeslice" not in result.dims return result @@ -235,7 +219,6 @@ def net_present_value( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present value (NPV) of the relevant technologies. @@ -263,32 +246,30 @@ def net_present_value( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPV calculated for the relevant technologies """ # Capital costs (lifetime) - _capital_costs = capital_costs( - technologies, capacity, timeslice_level, method="lifetime" - ) + _capital_costs = capital_costs(technologies, capacity, method="lifetime") # Revenue (annual) products = is_enduse(technologies.comm_usage) prices_non_env = filter_input(prices, commodity=products) - revenues = (production * prices_non_env).sum("commodity") + revenues = (production * prices_non_env).sum(["commodity", "timeslice"]) # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, prices, capacity, production, consumption ) # Calculate running costs and revenues over lifetime - _running_costs = annual_to_lifetime(_running_costs, technologies, timeslice_level) - revenues = annual_to_lifetime(revenues, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + revenues = annual_to_lifetime(revenues, technologies) # Net present value result = revenues - (_capital_costs + _running_costs) + assert "timeslice" not in result.dims return result @@ -299,7 +280,6 @@ def net_present_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Net present cost (NPC) of the relevant technologies. @@ -317,14 +297,12 @@ def net_present_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the NPC calculated for the relevant technologies """ - result = -net_present_value( - technologies, prices, capacity, production, consumption, timeslice_level - ) + result = -net_present_value(technologies, prices, capacity, production, consumption) + assert "timeslice" not in result.dims return result @@ -335,7 +313,6 @@ def equivalent_annual_cost( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, ) -> xr.DataArray: """Equivalent annual costs (or annualized cost) of a technology. @@ -357,7 +334,6 @@ def equivalent_annual_cost( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") Return: xr.DataArray with the EAC calculated for the relevant technologies @@ -368,10 +344,10 @@ def equivalent_annual_cost( capacity, production, consumption, - timeslice_level=timeslice_level, ) crf = capital_recovery_factor(technologies) - result = npc * broadcast_timeslice(crf, level=timeslice_level) + result = npc * crf + assert "timeslice" not in result.dims return result @@ -382,7 +358,6 @@ def levelized_cost_of_energy( capacity: xr.DataArray, production: xr.DataArray, consumption: xr.DataArray, - timeslice_level: str | None = None, method: str = "lifetime", ) -> xr.DataArray: """Levelized cost of energy (LCOE) of technologies over their lifetime. @@ -413,7 +388,6 @@ def levelized_cost_of_energy( production: xr.DataArray with commodity production by the relevant technologies consumption: xr.DataArray with commodity consumption by the relevant technologies - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") method: "lifetime" or "annual" Return: @@ -423,11 +397,11 @@ def levelized_cost_of_energy( raise ValueError("method must be either 'lifetime' or 'annual'.") # Capital costs (lifetime or annual depending on method) - _capital_costs = capital_costs(technologies, capacity, timeslice_level, method) + _capital_costs = capital_costs(technologies, capacity, method) # Running costs (annual) _running_costs = running_costs( - technologies, prices, capacity, production, consumption, timeslice_level + technologies, prices, capacity, production, consumption ) # Production (annual) @@ -436,19 +410,18 @@ def levelized_cost_of_energy( production.where(production > 0.0, 1e-6) .sel(commodity=products) .sum( - "commodity" + ["commodity", "timeslice"] ) # TODO: is this the correct way to deal with multiple products? ) # If method is lifetime, have to adjust running costs and production if method == "lifetime": - _running_costs = annual_to_lifetime( - _running_costs, technologies, timeslice_level - ) - prod = annual_to_lifetime(prod, technologies, timeslice_level) + _running_costs = annual_to_lifetime(_running_costs, technologies) + prod = annual_to_lifetime(prod, technologies) # LCOE result = (_capital_costs + _running_costs) / prod + assert "timeslice" not in result.dims return result @@ -502,9 +475,7 @@ def capital_recovery_factor(technologies: xr.Dataset) -> xr.DataArray: return crf -def annual_to_lifetime( - costs: xr.DataArray, technologies: xr.Dataset, timeslice_level: str | None = None -): +def annual_to_lifetime(costs: xr.DataArray, technologies: xr.Dataset): """Convert annual costs to lifetime costs. Costs are provided for a single year. These same costs are assumed to apply for the @@ -514,11 +485,10 @@ def annual_to_lifetime( Args: costs: xr.DataArray of costs for a single year. technologies: xr.Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day") """ assert "year" not in costs.dims assert "year" not in technologies.dims - assert "timeslice" in costs.dims + assert "timeslice" not in costs.dims life = technologies.technical_life.astype(int) iyears = range(life.values.max()) years = xr.DataArray(iyears, coords={"year": iyears}, dims="year") @@ -527,7 +497,6 @@ def annual_to_lifetime( interest_rate=technologies.interest_rate, mask=years <= life, ) - rates = broadcast_timeslice(rates, level=timeslice_level) return (costs * rates).sum("year") diff --git a/src/muse/objectives.py b/src/muse/objectives.py index d395d75d4..afed259db 100644 --- a/src/muse/objectives.py +++ b/src/muse/objectives.py @@ -306,7 +306,7 @@ def fixed_costs( from muse.costs import fixed_costs capacity = capacity_to_service_demand(technologies, demand) - result = fixed_costs(technologies, capacity).sum("timeslice") + result = fixed_costs(technologies, capacity) return result @@ -327,7 +327,7 @@ def capital_costs( from muse.costs import capital_costs capacity = capacity_to_service_demand(technologies, demand) - result = capital_costs(technologies, capacity, method="lifetime").sum("timeslice") + result = capital_costs(technologies, capacity, method="lifetime") result = xr.broadcast(result, demand.asset)[0] return result @@ -434,7 +434,6 @@ def annual_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="annual", ) @@ -481,7 +480,6 @@ def lifetime_levelized_cost_of_energy( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, method="lifetime", ) @@ -523,7 +521,6 @@ def net_present_value( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results @@ -602,6 +599,5 @@ def equivalent_annual_cost( capacity=capacity, production=production, consumption=consump, - timeslice_level=timeslice_level, ) return results diff --git a/src/muse/quantities.py b/src/muse/quantities.py index 4d639413f..c5626a2c5 100644 --- a/src/muse/quantities.py +++ b/src/muse/quantities.py @@ -323,9 +323,7 @@ def consumption( ) # Calculate degree of technology activity - prod_amplitude = production_amplitude( - production, params, timeslice_level=timeslice_level - ) + prod_amplitude = production_amplitude(production, params) # Calculate consumption of fixed commodities consumption_fixed = prod_amplitude * broadcast_timeslice( @@ -558,7 +556,6 @@ def capacity_to_service_demand( def production_amplitude( production: xr.DataArray, technologies: xr.Dataset, - timeslice_level: Optional[str] = None, ) -> xr.DataArray: """Calculates the degree of technology activity based on production data. @@ -576,14 +573,15 @@ def production_amplitude( Must have `timeslice` and `commodity` dimensions. May also have other dimensions e.g. `region`, `year`, etc. technologies: Dataset of technology parameters - timeslice_level: the desired timeslice level of the result (e.g. "hour", "day"). - Must match the timeslice level of `production` Returns: DataArray with production amplitudes for each technology in each timeslice. Will have the same dimensions as `production`, minus the `commodity` dimension. """ + from muse.timeslices import get_level + assert set(technologies.dims).issubset(set(production.dims)) + timeslice_level = get_level(production) return ( production diff --git a/src/muse/sectors/sector.py b/src/muse/sectors/sector.py index 79f15b1ad..839afbee4 100644 --- a/src/muse/sectors/sector.py +++ b/src/muse/sectors/sector.py @@ -14,7 +14,12 @@ from muse.sectors.abstract import AbstractSector from muse.sectors.register import register_sector from muse.sectors.subsector import Subsector -from muse.timeslices import compress_timeslice, expand_timeslice, get_level +from muse.timeslices import ( + broadcast_timeslice, + compress_timeslice, + expand_timeslice, + get_level, +) @register_sector(name="default") @@ -321,14 +326,13 @@ def market_variables(self, market: xr.Dataset, technologies: xr.Dataset) -> Any: capacity=capacity.isel(year=1), production=supply.isel(year=1), consumption=consume.isel(year=1), - timeslice_level=self.timeslice_level, method="annual", ) # Calculate new commodity prices costs = supply_cost( supply.where(~is_pollutant(supply.comm_usage), 0), - lcoe, + broadcast_timeslice(lcoe, level=self.timeslice_level), asset_dim="asset", ) diff --git a/tests/test_costs.py b/tests/test_costs.py index 3369a4fb4..2cb9271d7 100644 --- a/tests/test_costs.py +++ b/tests/test_costs.py @@ -3,14 +3,6 @@ YEAR = 2030 -"""Expected dimensions for the output data of the cost functions. - -This should be the same for all cost functions. In general, this is the sum of all -dimensions from the input data, minus "commodity", plus "timeslice" (if not already -present). -""" -EXPECTED_DIMS = {"asset", "region", "technology", "timeslice"} - @fixture def _prices(market): @@ -79,49 +71,49 @@ def test_capital_costs(_technologies, _capacity): from muse.costs import capital_costs result = capital_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_environmental_costs(_technologies, _prices, _production): from muse.costs import environmental_costs result = environmental_costs(_technologies, _prices, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fuel_costs(_technologies, _prices, _consumption): from muse.costs import fuel_costs result = fuel_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_material_costs(_technologies, _prices, _consumption): from muse.costs import material_costs result = material_costs(_technologies, _prices, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology", "timeslice"} def test_fixed_costs(_technologies, _capacity): from muse.costs import fixed_costs result = fixed_costs(_technologies, _capacity) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_variable_costs(_technologies, _production): from muse.costs import variable_costs result = variable_costs(_technologies, _production) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_running_costs(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import running_costs result = running_costs(_technologies, _prices, _capacity, _production, _consumption) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_net_present_value( @@ -132,7 +124,7 @@ def test_net_present_value( result = net_present_value( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_net_present_cost(_technologies, _prices, _capacity, _production, _consumption): @@ -141,7 +133,7 @@ def test_net_present_cost(_technologies, _prices, _capacity, _production, _consu result = net_present_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_equivalent_annual_cost( @@ -152,7 +144,7 @@ def test_equivalent_annual_cost( result = equivalent_annual_cost( _technologies, _prices, _capacity, _production, _consumption ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} @mark.parametrize("method", ["annual", "lifetime"]) @@ -164,16 +156,17 @@ def test_levelized_cost_of_energy( result = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method=method ) - assert set(result.dims) == EXPECTED_DIMS + assert set(result.dims) == {"asset", "region", "technology"} def test_supply_cost(_technologies, _prices, _capacity, _production, _consumption): from muse.costs import levelized_cost_of_energy, supply_cost + from muse.timeslices import broadcast_timeslice lcoe = levelized_cost_of_energy( _technologies, _prices, _capacity, _production, _consumption, method="annual" ) - result = supply_cost(_production, lcoe) + result = supply_cost(_production, broadcast_timeslice(lcoe)) assert set(result.dims) == { "commodity", "region", @@ -193,7 +186,7 @@ def test_capital_recovery_factor(_technologies): def test_annual_to_lifetime(_technologies, _prices, _consumption): from muse.costs import annual_to_lifetime, fuel_costs - _fuel_costs = fuel_costs(_technologies, _prices, _consumption) + _fuel_costs = fuel_costs(_technologies, _prices, _consumption).sum("timeslice") _fuel_costs_lifetime = annual_to_lifetime(_fuel_costs, _technologies) assert set(_fuel_costs.dims) == set(_fuel_costs_lifetime.dims) assert (_fuel_costs_lifetime > _fuel_costs).all() diff --git a/tests/test_objectives.py b/tests/test_objectives.py index 31db80af9..9f56aadc5 100644 --- a/tests/test_objectives.py +++ b/tests/test_objectives.py @@ -179,35 +179,35 @@ def test_annual_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import annual_levelized_cost_of_energy result = annual_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_lifetime_levelized_cost_of_energy(_technologies, _demand, _prices): from muse.objectives import lifetime_levelized_cost_of_energy result = lifetime_levelized_cost_of_energy(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_value(_technologies, _demand, _prices): from muse.objectives import net_present_value result = net_present_value(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_net_present_cost(_technologies, _demand, _prices): from muse.objectives import net_present_cost result = net_present_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def test_equivalent_annual_cost(_technologies, _demand, _prices): from muse.objectives import equivalent_annual_cost result = equivalent_annual_cost(_technologies, _demand, _prices) - assert set(result.dims) == {"replacement", "asset", "timeslice"} + assert set(result.dims) == {"replacement", "asset"} def add_var(coordinates, *dims, factor=100.0): From d86bd33a87a4825c3208abd8a5700a274e9fbb59 Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 18 Dec 2024 14:13:04 +0000 Subject: [PATCH 3/5] Update model results --- .../1-single-objective/Results/MCAPrices.csv | 144 ++++---- .../Results/MCACapacity.csv | 34 +- .../Results/MCAPrices.csv | 144 ++++---- .../1-correlation/Results/MCACapacity.csv | 48 +-- .../1-correlation/Results/MCAPrices.csv | 144 ++++---- .../1-introduction/Results/MCAPrices.csv | 144 ++++---- .../2-scenario/Results/MCACapacity.csv | 58 ++-- .../2-scenario/Results/MCAPrices.csv | 144 ++++---- .../1-new-region/Results/MCACapacity.csv | 54 +-- .../1-new-region/Results/MCAPrices.csv | 288 ++++++++-------- .../Results/MCACapacity.csv | 78 +++-- .../1-exogenous-demand/Results/MCAPrices.csv | 216 ++++++------ .../1-carbon-budget/Results/MCAPrices.csv | 84 ++--- .../1-min-constraint/Results/MCAPrices.csv | 144 ++++---- .../2-max-constraint/Results/MCAPrices.csv | 144 ++++---- .../Results/MCACapacity.csv | 53 +-- .../1-modify-timeslices/Results/MCAPrices.csv | 192 +++++------ .../Results/MCACapacity.csv | 187 ++++++---- .../Results/MCAPrices.csv | 320 +++++++++--------- .../new-decision-metric/Results/MCAPrices.csv | 144 ++++---- .../default/Results/MCACapacity.csv | 78 +++-- .../default/Results/MCAPrices.csv | 144 ++++---- .../default_retro/Results/MCACapacity.csv | 64 ++-- .../default_retro/Results/MCAPrices.csv | 144 ++++---- .../default_timeslice/Results/MCAPrices.csv | 144 ++++---- .../medium/Results/MCACapacity.csv | 88 ++--- .../medium/Results/MCAPrices.csv | 216 ++++++------ .../minimum_service/Results/MCAPrices.csv | 48 +-- .../multiple_agents/Results/MCACapacity.csv | 89 +++-- .../multiple_agents/Results/MCAPrices.csv | 144 ++++---- .../trade/Results/MCAPrices.csv | 216 ++++++------ 31 files changed, 2126 insertions(+), 2013 deletions(-) diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv index 2af3c5bdf..ed28cd276 100644 --- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,18.64740000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,15.88880000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,18.64740000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,15.88880000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,18.64740000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,15.88880000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,18.64740000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,15.88880000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,18.64740000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,15.88880000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,18.64740000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,15.88880000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,31.12680000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,19.78490000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,22.24850000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,18.74330000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,21.67520000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,19.78490000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,19.32750000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,18.74330000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,31.12680000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,19.78490000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,22.24850000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,18.74330000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.67520000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,19.78490000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,19.32750000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,18.74330000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,12.22360000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,19.78490000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,16.40640000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,18.74330000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,16.94940000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,19.78490000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,17.86690000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,18.74330000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,30.00890000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,19.53380000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,24.65190000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,21.32000000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,21.05190000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,19.53380000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,21.82980000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,21.32000000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,30.00890000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,19.53380000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,24.65190000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,21.32000000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,21.05190000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,19.53380000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,21.82980000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,21.32000000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,12.62180000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,19.53380000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,19.11300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,21.32000000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,16.57340000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,19.53380000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,20.41870000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,21.32000000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv index 9c2f8adbb..a4f8d9226 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv @@ -44,45 +44,41 @@ A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A2,12.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2040 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2040 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2040 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2040 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2040 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A2,8.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2045 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A2,1.81250000000,R1,2020,R1,power,windturbine,newcapa,2045 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2045 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2045 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2045 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2045 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2045 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 @@ -90,19 +86,17 @@ A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,0.80560000000,R1,2020,R1,power,gasCCGT,newcapa,2050 A1,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A1,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,5.37500000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,0.90620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 A2,5.68750000000,R1,2025,R1,power,windturbine,newcapa,2050 A2,0.75000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A2,14.62500000000,R1,2040,R1,power,windturbine,newcapa,2050 -A2,8.15620000000,R1,2045,R1,power,windturbine,newcapa,2050 +A2,3.62500000000,R1,2035,R1,power,windturbine,newcapa,2050 +A2,7.50000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A2,8.53130000000,R1,2045,R1,power,windturbine,newcapa,2050 A1,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A1,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A2,1.67600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A2,4.91330000000,R1,2025,R1,gas,gassupply1,newcapa,2050 A2,5.68330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A2,2.90000000000,R1,2035,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv index 6dd836112..af9577817 100644 --- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,19.79450000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.91960000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.44990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.86100000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.71490000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.91960000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.01750000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.86100000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,19.79450000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.91960000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.44990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.86100000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.71490000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.91960000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.01750000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.86100000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,15.53550000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.91960000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,9.88590000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.86100000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.53550000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.91960000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,10.35840000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.86100000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.62150000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.67440000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.57520000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,12.14890000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.49890000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.67440000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.71990000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,12.14890000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.62150000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.67440000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.57520000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,12.14890000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.49890000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.67440000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.71990000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,12.14890000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,11.37620000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.67440000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,9.86470000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,12.14890000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,15.93760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.67440000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,12.14890000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.93810000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,18.20480000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,17.11120000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,13.92760000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.50260000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,18.20480000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,14.39330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,13.92760000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,27.93810000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,18.20480000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,17.11120000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,13.92760000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.50260000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,18.20480000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,14.39330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,13.92760000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,11.83400000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,18.20480000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,11.82890000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,13.92760000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,15.28480000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,18.20480000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,13.03440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,13.92760000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,28.69690000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.77180000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,19.13560000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,13.00110000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.03790000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.77180000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,16.37310000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,13.00110000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,28.69690000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.77180000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,19.13560000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,13.00110000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.03790000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.77180000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,16.37310000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,13.00110000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,12.04500000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.77180000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,13.74380000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,13.00110000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.70840000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.77180000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,14.99180000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,13.00110000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,30.68450000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.61580000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,18.57100000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.24370000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,21.01770000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.61580000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,14.09200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.24370000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,30.68450000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.61580000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,18.57100000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.24370000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,21.01770000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.61580000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,14.09200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.24370000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,11.35100000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.61580000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,9.61310000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.24370000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,16.18440000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.61580000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,11.85260000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.24370000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.95250000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,17.86660000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.11000000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.74410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.53890000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.86660000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.30160000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.74410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.95250000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.86660000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.11000000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.74410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.53890000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.86660000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.30160000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.74410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,11.43000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.86660000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.01500000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.74410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.33200000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.86660000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89730000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.74410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv index a529850e6..81c8cb97e 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv @@ -2,35 +2,37 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,16.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,20.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,13.12220000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,12.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,12.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,7.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,12.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.62220000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,1.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,5.01000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv index be5fc8b12..c8b006471 100644 --- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,27.78890000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.37150000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.49630000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.73650000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.25210000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.37150000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.90130000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.73650000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,27.78890000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.37150000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.49630000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.73650000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.25210000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.37150000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.90130000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.73650000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,13.79410000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.37150000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.73650000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.51000000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.37150000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.60580000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.73650000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.23940000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.85650000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.27490000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.48640000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.40190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,19.85650000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.99130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.48640000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.23940000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,19.85650000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.27490000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.48640000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.40190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,19.85650000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.99130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.48640000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,19.85650000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.80890000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.48640000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.51750000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,19.85650000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.85760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.48640000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,30.11110000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.01050000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.04090000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.40110000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.98030000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.01050000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.64400000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.40110000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,30.11110000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.01050000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.04090000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.40110000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.98030000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.01050000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.64400000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.40110000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.01050000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.40110000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.95030000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.01050000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.40110000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.31080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.78520000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.27410000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.06220000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.44920000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.78520000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.79870000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.06220000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.31080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.78520000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.27410000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.06220000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.44920000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.78520000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.79870000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.06220000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.78520000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.06220000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.55290000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.78520000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.08010000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.06220000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.81720000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,26.46380000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.68530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.10320000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.12170000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,26.46380000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.40800000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.10320000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,28.81720000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,26.46380000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.68530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.10320000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.12170000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,26.46380000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.40800000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.10320000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,26.46380000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.10320000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.30790000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,26.46380000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.78780000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.10320000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,28.34170000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.00280000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.84390000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.18620000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.80620000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.00280000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.51320000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.18620000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,28.34170000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.00280000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.84390000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.18620000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.80620000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.00280000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.51320000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.18620000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.00280000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.18620000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.07180000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.00280000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.86650000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.18620000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv index bd9949c60..dc4bef5f0 100644 --- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,23.72940000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,15.14750000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.92520000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.68210000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,16.44690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,15.14750000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.34790000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.68210000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,23.72940000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,15.14750000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.92520000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.68210000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,16.44690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,15.14750000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.34790000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.68210000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,9.46380000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,15.14750000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,6.86530000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.68210000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,12.80570000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,15.14750000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.55920000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.68210000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,23.13530000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,14.16450000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,13.43880000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.20200000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,15.42350000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,14.16450000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,8.95920000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.20200000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,23.13530000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,14.16450000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,13.43880000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.20200000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,15.42350000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,14.16450000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,8.95920000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.20200000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,14.16450000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.20200000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,11.56760000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,14.16450000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,6.71940000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.20200000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,13.58310000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,8.26320000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.05540000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,8.26320000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,13.58310000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,8.26320000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.05540000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,8.26320000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,8.26320000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,6.79160000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,8.26320000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,24.19760000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,14.62300000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,16.13180000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,14.62300000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,24.19760000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,14.62300000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,16.13180000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,14.62300000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,14.62300000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,12.09880000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,14.62300000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.00810000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,8.44660000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,9.33870000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,8.44660000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.00810000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,8.44660000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,9.33870000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,8.44660000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,8.44660000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.00400000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,8.44660000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,24.78780000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,14.24420000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,8.54650000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,16.52520000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,9.49610000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,8.54650000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,24.78780000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,14.24420000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,8.54650000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,16.52520000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,9.49610000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,8.54650000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,8.26260000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,4.74810000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,8.54650000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,12.39390000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.12210000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,8.54650000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv index 9d0e2acf9..f59c669d3 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv @@ -2,41 +2,51 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,19.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2030 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,11.62600000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2035 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2035 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2040 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2045 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,1.91410000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2050 -A1,26.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,12.25000000000,R1,2025,R1,power,solarPV,newcapa,2050 +A1,7.00000000000,R1,2030,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.91410000000,R1,2045,R1,power,solarPV,newcapa,2050 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv index b5e21cadc..9062092d8 100644 --- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.95190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.83290000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.34350000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.86940000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.96800000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.83290000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.09370000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.86940000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.95190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.83290000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.34350000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.86940000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.96800000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.83290000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.09370000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.86940000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,10.32830000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.83290000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.92150000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.86940000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.97600000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.83290000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.96880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.86940000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.49290000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,22.56210000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.30980000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.62230000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.66190000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,22.56210000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.87320000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.62230000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.49290000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,22.56210000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.30980000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.62230000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.66190000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,22.56210000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.87320000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.62230000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.83100000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,22.56210000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.57430000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.62230000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.74650000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,22.56210000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.15490000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.62230000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.11580000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.51490000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.12620000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.00340000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.41060000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.51490000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.75080000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.00340000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.11580000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.51490000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.12620000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.00340000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.41060000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.51490000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.75080000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.00340000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.70530000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.51490000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.37540000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.00340000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.55790000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.51490000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.06310000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.00340000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,28.57480000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.73500000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.97540000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.49140000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.04990000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.73500000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.65020000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.49140000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,28.57480000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,24.73500000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.97540000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.49140000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.04990000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.73500000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.65020000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.49140000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.52490000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.73500000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.32510000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.49140000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.28740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.73500000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.98770000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.49140000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,28.15410000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.57320000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.75900000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.82670000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.76940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.57320000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.50600000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.82670000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,28.15410000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,25.57320000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.75900000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,12.82670000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.76940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.57320000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.50600000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.82670000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.38470000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.57320000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.25300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.82670000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.07700000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.57320000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.87950000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.82670000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv index 8372798e6..0e3ff2e19 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv @@ -20,56 +20,58 @@ A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,23.43330000000,R2,2020,R2,gas,gassupply1,newcapa,2030 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A1,10.00000000000,R2,2025,R2,residential,gasboiler,newcapa,2035 -A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2035 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2035 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2035 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2035 -A1,26.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2040 -A1,26.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 +A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,6.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2040 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040 +A1,20.00000000000,R2,2030,R2,residential,heatpump,newcapa,2040 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2040 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2040 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2040 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2040 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2040 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2040 -A1,16.00000000000,R1,2035,R1,residential,gasboiler,newcapa,2045 +A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2045 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045 A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045 -A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2045 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2045 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2045 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2045 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2045 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2045 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A1,12.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2050 A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050 A1,20.00000000000,R2,2040,R2,residential,heatpump,newcapa,2050 -A1,26.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,11.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,26.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 -A1,11.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 +A1,23.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,23.00000000000,R2,2030,R2,power,windturbine,newcapa,2050 +A1,8.00000000000,R2,2035,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2040,R2,power,windturbine,newcapa,2050 +A1,3.00000000000,R2,2045,R2,power,windturbine,newcapa,2050 A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 A1,13.94440000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,16.52220000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 A1,15.93330000000,R2,2020,R2,gas,gassupply1,newcapa,2050 A1,13.94440000000,R2,2025,R2,gas,gassupply1,newcapa,2050 -A1,16.52220000000,R2,2030,R2,gas,gassupply1,newcapa,2050 -A1,7.73330000000,R2,2035,R2,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv index 834c47225..3f6809b3d 100644 --- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv @@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,14.43830000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,12.95410000000,R2,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,13.20140000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,12.95410000000,R2,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,14.43830000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,12.95410000000,R2,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,13.20140000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,12.95410000000,R2,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.96460000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,12.95410000000,R2,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,12.58300000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,12.95410000000,R2,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,34.88690000000,R2,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.70430000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,16.70430000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,15.29130000000,R2,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,34.88690000000,R2,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.50860000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,15.50860000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,15.29130000000,R2,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,34.88690000000,R2,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.70430000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,16.70430000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,15.29130000000,R2,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,34.88690000000,R2,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.50860000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,15.50860000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,15.29130000000,R2,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,34.88690000000,R2,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,14.35420000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,15.29130000000,R2,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,34.88690000000,R2,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.91080000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,14.91080000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,15.29130000000,R2,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,20.57330000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.41210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,19.41210000000,R2,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,19.33650000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.41210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,19.41210000000,R2,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,20.57330000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.41210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,19.41210000000,R2,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,19.33650000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.41210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,19.41210000000,R2,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,18.09960000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.41210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,19.41210000000,R2,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,18.71800000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.41210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,19.41210000000,R2,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,55.49860000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,55.49860000000,R2,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,24.31870000000,R2,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,20.44320000000,R2,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,38.00770000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,38.00770000000,R2,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,23.08180000000,R2,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,20.44320000000,R2,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,55.49860000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,55.49860000000,R2,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,24.31870000000,R2,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,20.44320000000,R2,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,38.00770000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,38.00770000000,R2,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,23.08180000000,R2,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,20.44320000000,R2,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,21.23570000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,21.23570000000,R2,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,21.84500000000,R2,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,20.44320000000,R2,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,29.26230000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,29.26230000000,R2,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,22.46340000000,R2,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,20.44320000000,R2,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,31.24370000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,31.24370000000,R2,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,22.07200000000,R2,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.78030000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,24.78030000000,R2,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,22.07200000000,R2,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,31.24370000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,31.24370000000,R2,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,22.07200000000,R2,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.78030000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,24.78030000000,R2,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,22.07200000000,R2,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.31680000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,18.31680000000,R2,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,22.07200000000,R2,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54860000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,21.54860000000,R2,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,22.07200000000,R2,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,59.99930000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,night,all-year,59.99930000000,R2,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,35.99960000000,R2,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,33.34050000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,33.34050000000,R2,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,23.92260000000,R2,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,39.99950000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,39.99950000000,R2,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,35.99960000000,R2,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.49220000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,25.49220000000,R2,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,23.92260000000,R2,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,59.99930000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,59.99930000000,R2,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,35.99960000000,R2,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,33.34050000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,33.34050000000,R2,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,23.92260000000,R2,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,39.99950000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,39.99950000000,R2,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,35.99960000000,R2,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.49220000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,25.49220000000,R2,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,23.92260000000,R2,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,19.99980000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,19.99980000000,R2,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,35.99960000000,R2,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,17.64400000000,R2,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,23.92260000000,R2,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,29.99960000000,R1,5,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,29.99960000000,R2,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,35.99960000000,R2,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.56810000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,21.56810000000,R2,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,23.92260000000,R2,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv index 7a984d661..0a572222b 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv @@ -3,53 +3,63 @@ A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,61.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2030 -A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2030 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,24.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,electric_stove,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,54.36670000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,17.07890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,10.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035 -A1,10.00000000000,R1,2025,R1,residential,gas_stove,newcapa,2035 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,20.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,3.00000000000,R1,2045,R1,power,gasCCGT,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,50.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,23.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,13.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,4.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,46.86670000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,7.50000000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,24.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,14.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,32.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,9.57890000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,0.44110000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv index 7478dbc8e..40c6715d3 100644 --- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv +++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.60050000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.45130000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.36600000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,10.81680000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,20.22790000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,9.99810000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.45130000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.36600000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,10.19830000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.60050000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,9.99810000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.45130000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.36600000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,10.81680000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,20.22790000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,9.99810000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.45130000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.36600000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,10.19830000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,11.04390000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,9.99810000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.45130000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.36600000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,9.57990000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,15.54150000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,9.99810000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.45130000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.36600000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,9.88910000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,9.99810000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.86950000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,12.60140000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,10.08400000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,18.86950000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,12.00350000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,10.08400000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,18.86950000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,12.60140000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,10.08400000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,18.86950000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,12.00350000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,10.08400000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,18.86950000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,11.42630000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,10.08400000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,18.86950000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,11.70460000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,29.03190000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,10.08400000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,19.98000000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,15.83490000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,19.35460000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,10.58940000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.98000000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,11.82530000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,29.03190000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,10.58940000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.98000000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,15.83490000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,19.35460000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,10.58940000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.98000000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,11.82530000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,10.58940000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.98000000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,7.90890000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.51590000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,10.58940000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.98000000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,9.82050000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,29.64250000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,10.58940000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,20.55170000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,15.94180000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.76170000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,10.81810000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,20.55170000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,10.62790000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,29.64250000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,10.81810000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,20.55170000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,15.94180000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.76170000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,10.81810000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,20.55170000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,10.62790000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,10.81810000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,20.55170000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.82120000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,10.81810000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,20.55170000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,7.97090000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,10.81810000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,21.28220000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,16.18600000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,11.11030000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,21.28220000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,10.79070000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,11.11030000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,21.28220000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,16.18600000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,11.11030000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,21.28220000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,10.79070000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,11.11030000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,21.28220000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,11.11030000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,21.28220000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,8.09300000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,31.08270000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.11030000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,21.84970000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,16.76210000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,21.65230000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,11.33730000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,21.84970000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,11.54690000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,31.08270000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,11.33730000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,21.84970000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,16.76210000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,21.65230000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,11.33730000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,21.84970000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,11.54690000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,12.33240000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,11.33730000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,21.84970000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,6.37600000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,16.93710000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,11.33730000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,21.84970000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,8.93940000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,11.33730000000,R1,5,MUS$2010/PJ,2050 diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv index 7c45f0b0b..a86cc709d 100644 --- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv +++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv @@ -23,75 +23,75 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.45650000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.15070000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,15.82560000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.03660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,19.71110000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.15070000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.78500000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.03660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,28.45650000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.15070000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,15.82560000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.03660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,19.71110000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.15070000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.78500000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.03660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.32510000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.15070000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.85820000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.03660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,15.33840000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.15070000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,9.76470000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.03660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,26.13870000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,18.07270000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,14.64020000000,R1,0,MUS$2010/PJ,2030 -CO2f,all-week,night,all-year,0.14000000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.77800000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,night,all-year,9.76530000000,R1,0,MUS$2010/PJ,2030 +CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030 +electricity,all-week,morning,all-year,18.07270000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,10.70100000000,R1,1,MUS$2010/PJ,2030 -CO2f,all-week,morning,all-year,0.14000000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,26.13870000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,9.76530000000,R1,1,MUS$2010/PJ,2030 +CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030 +electricity,all-week,afternoon,all-year,18.07270000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,14.64020000000,R1,2,MUS$2010/PJ,2030 -CO2f,all-week,afternoon,all-year,0.14000000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.77800000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,9.76530000000,R1,2,MUS$2010/PJ,2030 +CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030 +electricity,all-week,early-peak,all-year,18.07270000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,10.70100000000,R1,3,MUS$2010/PJ,2030 -CO2f,all-week,early-peak,all-year,0.14000000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,14.05910000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,9.76530000000,R1,3,MUS$2010/PJ,2030 +CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030 +electricity,all-week,late-peak,all-year,18.07270000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.06670000000,R1,4,MUS$2010/PJ,2030 -CO2f,all-week,late-peak,all-year,0.14000000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,16.59760000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,9.76530000000,R1,4,MUS$2010/PJ,2030 +CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030 +electricity,all-week,evening,all-year,18.07270000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,8.73140000000,R1,5,MUS$2010/PJ,2030 -CO2f,all-week,evening,all-year,0.14000000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,28.31600000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.76530000000,R1,5,MUS$2010/PJ,2030 +CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030 +electricity,all-week,night,all-year,19.37380000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.65540000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,10.34690000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.79320000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,19.37380000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.20330000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,10.34690000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,28.31600000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,19.37380000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.65540000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,10.34690000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.79320000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,19.37380000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.20330000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,10.34690000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,13.43040000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,19.37380000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,6.81520000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,10.34690000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,17.03180000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,19.37380000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.97720000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,10.34690000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2035 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv index f2c4946fa..4407df9bf 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.52500000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.75250000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.52500000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.75250000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.85430000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,9.41810000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.75530000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.75250000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.52500000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.75250000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.52500000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.75250000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.81060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,9.06240000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,7.16510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.75250000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv index 9e580eb17..bdb9ecbb2 100644 --- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv +++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,13.93410000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,9.03590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.82840000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.60570000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.92540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,9.03590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.28770000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.60570000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,14.06800000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,10.21280000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,11.12940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.60570000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.92540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,9.03590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.28770000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.60570000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.07980000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.25580000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.31070000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.60570000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.03060000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.25580000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.56400000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.60570000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv index 1b2c297a2..90da2b071 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv @@ -2,41 +2,46 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,22.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,28.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,17.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,20.85560000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,22.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,27.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,22.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,14.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,5.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,5.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,13.35560000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,6.88560000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv index 5a6369539..e6051e7d2 100644 --- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv @@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.73140000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.66930000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.54990000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.66180000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.13150000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.66930000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,12.00320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.66180000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,mid-afternoon,all-year,28.73140000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,mid-afternoon,all-year,19.66930000000,R1,2,MUS$2010/PJ,2025 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,mid-afternoon,all-year,12.54990000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,mid-afternoon,all-year,10.66180000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.13150000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.66930000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,12.00320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.66180000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.39310000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.66930000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.66180000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.06490000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.66930000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.63880000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.66180000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,early-morning,all-year,16.06490000000,R1,6,MUS$2010/PJ,2025 +electricity,all-week,early-morning,all-year,19.66930000000,R1,6,MUS$2010/PJ,2025 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025 -heat,all-week,early-morning,all-year,11.63880000000,R1,6,MUS$2010/PJ,2025 +heat,all-week,early-morning,all-year,10.66180000000,R1,6,MUS$2010/PJ,2025 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025 -electricity,all-week,late-afternoon,all-year,16.06490000000,R1,7,MUS$2010/PJ,2025 +electricity,all-week,late-afternoon,all-year,19.66930000000,R1,7,MUS$2010/PJ,2025 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025 -heat,all-week,late-afternoon,all-year,11.63880000000,R1,7,MUS$2010/PJ,2025 +heat,all-week,late-afternoon,all-year,10.66180000000,R1,7,MUS$2010/PJ,2025 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.14590000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.50550000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.55760000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.99970000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.14590000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.24310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.55760000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.14590000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.50550000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.55760000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.99970000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.14590000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.24310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.55760000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.14590000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.47790000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.55760000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.14590000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.73480000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.55760000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,14.99980000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.14590000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,11.73480000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.55760000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,14.99980000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.14590000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,11.73480000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.55760000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,21.73500000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.25160000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.15810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,21.73500000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,11.37610000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.15810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,mid-afternoon,all-year,21.73500000000,R1,2,MUS$2010/PJ,2035 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,mid-afternoon,all-year,16.25160000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,mid-afternoon,all-year,11.15810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,21.73500000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,11.37610000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.15810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,21.73500000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.15810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,21.73500000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.12580000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.15810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2035 +electricity,all-week,early-morning,all-year,21.73500000000,R1,6,MUS$2010/PJ,2035 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035 -heat,all-week,early-morning,all-year,8.12580000000,R1,6,MUS$2010/PJ,2035 +heat,all-week,early-morning,all-year,11.15810000000,R1,6,MUS$2010/PJ,2035 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035 -electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2035 +electricity,all-week,late-afternoon,all-year,21.73500000000,R1,7,MUS$2010/PJ,2035 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035 -heat,all-week,late-afternoon,all-year,8.12580000000,R1,7,MUS$2010/PJ,2035 +heat,all-week,late-afternoon,all-year,11.15810000000,R1,7,MUS$2010/PJ,2035 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.84660000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,22.98980000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.09250000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,11.68510000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,20.89260000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,22.98980000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.26480000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,11.68510000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,29.84660000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,22.98980000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.09250000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,11.68510000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,20.89260000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,22.98980000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.26480000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,11.68510000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,22.98980000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,11.68510000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.92330000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,22.98980000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.04630000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,11.68510000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,14.92330000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,22.98980000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.04630000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,11.68510000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,14.92330000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,22.98980000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.04630000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,11.68510000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.46390000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,24.50140000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.26470000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,20.62470000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,24.50140000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,11.33320000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.26470000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,mid-afternoon,all-year,29.46390000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,mid-afternoon,all-year,24.50140000000,R1,2,MUS$2010/PJ,2045 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,mid-afternoon,all-year,16.19040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,mid-afternoon,all-year,12.26470000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,20.62470000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,24.50140000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,11.33320000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.26470000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,24.50140000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.26470000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.73200000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,24.50140000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09520000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.26470000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,early-morning,all-year,14.73200000000,R1,6,MUS$2010/PJ,2045 +electricity,all-week,early-morning,all-year,24.50140000000,R1,6,MUS$2010/PJ,2045 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045 -heat,all-week,early-morning,all-year,8.09520000000,R1,6,MUS$2010/PJ,2045 +heat,all-week,early-morning,all-year,12.26470000000,R1,6,MUS$2010/PJ,2045 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045 -electricity,all-week,late-afternoon,all-year,14.73200000000,R1,7,MUS$2010/PJ,2045 +electricity,all-week,late-afternoon,all-year,24.50140000000,R1,7,MUS$2010/PJ,2045 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045 -heat,all-week,late-afternoon,all-year,8.09520000000,R1,7,MUS$2010/PJ,2045 +heat,all-week,late-afternoon,all-year,12.26470000000,R1,7,MUS$2010/PJ,2045 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.16630000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,25.73530000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.08020000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,12.77780000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,20.41640000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,25.73530000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,11.25620000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,12.77780000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,mid-afternoon,all-year,29.16630000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,mid-afternoon,all-year,25.73530000000,R1,2,MUS$2010/PJ,2050 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,mid-afternoon,all-year,16.08020000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,mid-afternoon,all-year,12.77780000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,20.41640000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,25.73530000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,11.25620000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,12.77780000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,25.73530000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,12.77780000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.58320000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,25.73530000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.04010000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,12.77780000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -electricity,all-week,early-morning,all-year,14.58320000000,R1,6,MUS$2010/PJ,2050 +electricity,all-week,early-morning,all-year,25.73530000000,R1,6,MUS$2010/PJ,2050 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050 -heat,all-week,early-morning,all-year,8.04010000000,R1,6,MUS$2010/PJ,2050 +heat,all-week,early-morning,all-year,12.77780000000,R1,6,MUS$2010/PJ,2050 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050 -electricity,all-week,late-afternoon,all-year,14.58320000000,R1,7,MUS$2010/PJ,2050 +electricity,all-week,late-afternoon,all-year,25.73530000000,R1,7,MUS$2010/PJ,2050 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050 -heat,all-week,late-afternoon,all-year,8.04010000000,R1,7,MUS$2010/PJ,2050 +heat,all-week,late-afternoon,all-year,12.77780000000,R1,7,MUS$2010/PJ,2050 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index 5b4e39d1d..d0d8822bd 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -2,96 +2,139 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 -A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2022 -A1,17.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2024 -A1,24.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2024 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2024 -A1,15.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2026 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2026 -A1,22.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2026 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2026 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2026 -A1,13.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2028 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2028 +A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 +A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 +A1,16.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2022 +A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 +A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 +A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 +A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,19.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2028 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2028 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 -A1,11.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2030 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 +A1,12.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 -A1,16.98890000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2030 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2030 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 +A1,9.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2030 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 -A1,4.00000000000,R1,2022,R1,residential,gasboiler,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2032 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2032 +A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 -A1,4.00000000000,R1,2024,R1,residential,gasboiler,newcapa,2034 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2034 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 +A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,6.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 +A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2036 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 +A1,3.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2038 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 +A1,1.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2036 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2036 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2038 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 -A1,1.00000000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,7.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,1.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 -A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,7.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,9.48890000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,2.57780000000,R1,2022,R1,gas,gassupply1,newcapa,2040 -A1,4.07780000000,R1,2024,R1,gas,gassupply1,newcapa,2040 -A1,2.09220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,1.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2040 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 +A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 +A1,1.50000000000,R1,2034,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 21a1723f6..66e93afd5 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,17.84810000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,11.14530000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.94130000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,17.84810000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,10.58990000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.94130000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,17.84810000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,11.14530000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.94130000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,17.84810000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,10.58990000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.94130000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,17.84810000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,9.91240000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.94130000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,17.84810000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,10.21960000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.94130000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,17.84810000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,10.21960000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.94130000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,17.84810000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,10.21960000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.94130000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,18.34290000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,12.08070000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.23890000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,18.34290000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,11.53140000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.23890000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,18.34290000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,12.08070000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.23890000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,18.34290000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,11.53140000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.23890000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,18.34290000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,10.86820000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.23890000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,18.34290000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,11.16520000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.23890000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,18.34290000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,11.16520000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.23890000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,18.34290000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,11.16520000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.23890000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,28.18210000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,19.19800000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,13.01990000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.50420000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,21.14710000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,19.19800000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,12.47560000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.50420000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,28.18210000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,19.19800000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,13.01990000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.50420000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,21.14710000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,19.19800000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,12.47560000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.50420000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,13.13840000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,19.19800000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,11.82410000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.50420000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,16.45720000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,19.19800000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,12.11280000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.50420000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,16.45720000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,19.19800000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,12.11280000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.50420000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,16.45720000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,19.19800000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,12.11280000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.50420000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,21.78380000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,21.33220000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,13.79450000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,11.15270000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,20.43760000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,21.33220000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,13.05290000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,11.15270000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,21.78380000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,21.33220000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,13.79450000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,11.15270000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,20.43760000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,21.33220000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,13.05290000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,11.15270000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,20.03640000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,21.33220000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,12.24840000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,11.15270000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,20.03640000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,21.33220000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,12.59030000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,11.15270000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,20.03640000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,21.33220000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,12.59030000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,11.15270000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,20.03640000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,21.33220000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,12.59030000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,11.15270000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,27.14130000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.66670000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.04110000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.16590000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,20.52480000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.66670000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.39530000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.16590000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,27.14130000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,21.66670000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,15.04110000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,11.16590000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,20.52480000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.66670000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.39530000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.16590000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,13.10640000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.66670000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.46970000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.16590000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,16.11390000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.66670000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,12.29810000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.16590000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,16.11390000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,21.66670000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,12.29810000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,11.16590000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,16.11390000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,21.66670000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,12.29810000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,11.16590000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,27.76890000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,22.77310000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,15.61150000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.59290000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,20.16660000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,22.77310000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,12.48980000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.59290000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,27.76890000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,22.77310000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,15.61150000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.59290000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,20.16660000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,22.77310000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,12.48980000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.59290000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,11.57930000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,22.77310000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,8.91720000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.59290000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,15.09840000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,22.77310000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,10.40860000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.59290000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,15.09840000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,22.77310000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,10.40860000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.59290000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,15.09840000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,22.77310000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,10.40860000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.59290000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,28.90960000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,23.73320000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,16.15900000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.96350000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,20.82540000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,23.73320000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,12.26530000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.96350000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,28.90960000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,23.73320000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,16.15900000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.96350000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,20.82540000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,23.73320000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,12.26530000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.96350000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,11.34000000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,23.73320000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,7.65920000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,11.96350000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,15.43600000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,23.73320000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,9.66950000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,11.96350000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,15.43600000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,23.73320000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,9.66950000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,11.96350000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,15.43600000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,23.73320000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,9.66950000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,11.96350000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,29.00110000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,24.57440000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,15.94520000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,12.28820000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,20.82440000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,24.57440000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,11.52040000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,12.28820000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,29.00110000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,24.57440000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,15.94520000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,12.28820000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,20.82440000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,24.57440000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,11.52040000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,12.28820000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,11.23880000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,24.57440000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,6.30000000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,12.28820000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,15.37320000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,24.57440000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,8.57040000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,12.28820000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,15.37320000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,24.57440000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,8.57040000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,12.28820000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,15.37320000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,24.57440000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,8.57040000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,12.28820000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,29.01340000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,25.31740000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,15.96350000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,12.57500000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,20.84430000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,25.31740000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,11.54170000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,12.57500000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,29.01340000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,25.31740000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,15.96350000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,12.57500000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,20.84430000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,25.31740000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,11.54170000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,12.57500000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,11.30590000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,25.31740000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,6.34770000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,12.57500000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,15.39820000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,25.31740000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,8.59380000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,12.57500000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,15.39820000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,25.31740000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,8.59380000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,12.57500000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,15.39820000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,25.31740000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,8.59380000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,12.57500000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,29.74200000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.95080000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.86960000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,21.34970000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.95080000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,11.82000000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.86960000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,29.74200000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,25.95080000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.86960000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,21.34970000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.95080000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,11.82000000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.86960000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,11.32890000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.95080000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,6.36560000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.86960000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,15.75480000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.95080000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.79060000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.86960000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,15.75480000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,25.95080000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,8.79060000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.86960000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,15.75480000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,25.95080000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,8.79060000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.86960000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv index 7d1d3c8b4..6582dda8b 100644 --- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv +++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,23.65520000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,16.05040000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,13.53940000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,9.60580000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,17.07860000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,16.05040000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,10.18560000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,9.60580000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,23.65520000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,16.05040000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,13.53940000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,9.60580000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,17.07860000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,16.05040000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,10.18560000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,9.60580000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,11.06570000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,16.05040000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,7.01030000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,9.60580000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,13.79030000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,16.05040000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,8.50870000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,9.60580000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,24.62710000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,15.61770000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,14.03560000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,8.78330000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,16.91320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,15.61770000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,9.55510000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,8.78330000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,24.62710000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,15.61770000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,14.03560000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,8.78330000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,16.91320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,15.61770000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,9.55510000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,8.78330000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.67720000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,15.61770000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,5.31390000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,8.78330000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.05630000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,15.61770000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,7.31490000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,8.78330000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,25.63370000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,16.08280000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,14.58250000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,9.03050000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,17.59880000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,16.08280000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,9.92550000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,9.03050000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,25.63370000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,16.08280000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,14.58250000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,9.03050000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,17.59880000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,16.08280000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,9.92550000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,9.03050000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.73490000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,16.08280000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.33700000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,9.03050000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,13.58140000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,16.08280000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.59710000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,9.03050000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,25.79830000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,16.19560000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,14.64830000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.07570000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,17.73090000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,16.19560000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,9.97840000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.07570000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,25.79830000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,16.19560000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,14.64830000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.07570000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,17.73090000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,16.19560000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,9.97840000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.07570000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.81020000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,16.19560000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.36710000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.07570000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,13.69720000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,16.19560000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.64340000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.07570000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,26.02320000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,16.38170000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,14.73830000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.15010000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,17.93140000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,16.38170000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.05860000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.15010000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,26.02320000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,16.38170000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,14.73830000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.15010000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,17.93140000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,16.38170000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.05860000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.15010000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.96810000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,16.38170000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.43020000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.15010000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,13.88550000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,16.38170000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.71870000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.15010000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,26.77680000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,16.87480000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.03970000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.34730000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,18.47300000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,16.87480000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.27520000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.34730000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,26.77680000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,16.87480000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.03970000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.34730000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,18.47300000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,16.87480000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.27520000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.34730000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,10.28610000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,16.87480000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.55750000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.34730000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.32110000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,16.87480000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.89300000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.34730000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv index 0a20fcc39..e7cfae67c 100644 --- a/tests/example_outputs/default/Results/MCACapacity.csv +++ b/tests/example_outputs/default/Results/MCACapacity.csv @@ -2,41 +2,61 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,26.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,7.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,5.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv index 25a14a2a1..17bba3927 100644 --- a/tests/example_outputs/default/Results/MCAPrices.csv +++ b/tests/example_outputs/default/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,28.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.21210000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.17680000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.33310000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.00610000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.17680000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,28.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.21210000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.17680000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.33310000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.00610000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.17680000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.87620000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.17680000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.49980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.90310000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.17680000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,15.92890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.61930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,15.92890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.61930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,7.96440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.28540000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.52360000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.28540000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.52360000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.64270000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.04320000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.69540000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.04320000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.69540000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.02160000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.44410000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.62940000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.44410000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.62940000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.72200000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv index d81760203..e0af1be69 100644 --- a/tests/example_outputs/default_retro/Results/MCACapacity.csv +++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv @@ -2,41 +2,51 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year A1,10.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020 -A1,24.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2025 -A1,19.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2030 +A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2025 +A1,7.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2025 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2025 +A1,19.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2025 +A1,19.00000000000,R1,2020,R1,residential,heatpump,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,retrofit,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2030 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2030 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2030 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2030 +A1,11.62600000000,R1,2020,R1,gas,gassupply1,retrofit,2030 A1,11.00000000000,R1,2025,R1,residential,heatpump,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2035 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2035 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2035 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2035 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2035 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2035 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2035 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2035 A1,25.00000000000,R1,2030,R1,residential,heatpump,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2040 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2040 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2040 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2040 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2040 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2040 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2040 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2040 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2040 A1,17.00000000000,R1,2035,R1,residential,heatpump,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2045 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2045 +A1,1.91410000000,R1,2020,R1,power,windturbine,retrofit,2045 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2045 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2045 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2045 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2045 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2045 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2045 A1,31.00000000000,R1,2040,R1,residential,heatpump,retrofit,2050 A1,23.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,retrofit,2050 -A1,25.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050 +A1,6.59380000000,R1,2020,R1,power,gasCCGT,retrofit,2050 +A1,13.25000000000,R1,2025,R1,power,windturbine,retrofit,2050 +A1,12.00000000000,R1,2030,R1,power,windturbine,retrofit,2050 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,retrofit,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,retrofit,2050 +A1,7.91410000000,R1,2045,R1,power,windturbine,retrofit,2050 +A1,4.12600000000,R1,2020,R1,gas,gassupply1,retrofit,2050 +A1,5.31250000000,R1,2030,R1,gas,gassupply1,retrofit,2050 +A1,1.57310000000,R1,2035,R1,gas,gassupply1,retrofit,2050 diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv index 89d70fbf7..d1d6049d3 100644 --- a/tests/example_outputs/default_retro/Results/MCAPrices.csv +++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,30.32710000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,21.18690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,30.32710000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,21.18690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.04670000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.61680000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.76060000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.46990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.90170000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.76060000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,13.08250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.90170000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,20.76060000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.46990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,10.90170000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.76060000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,13.08250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.90170000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.76060000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.90170000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.76060000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.88880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.90170000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.07660000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.22810000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.07660000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.22810000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.07660000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.22810000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.07660000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.22810000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.07660000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.22810000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.07660000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.22810000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.72020000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08550000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.72020000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08550000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,23.72020000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.08550000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.72020000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08550000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.72020000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08550000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.72020000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08550000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,25.30560000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,12.71960000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,25.30560000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,12.71960000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,25.30560000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,12.71960000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,25.30560000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,12.71960000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,25.30560000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,12.71960000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,25.30560000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,12.71960000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,26.53870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,13.21290000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,26.53870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,13.21290000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,26.53870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,13.21290000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,26.53870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,13.21290000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,26.53870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,13.21290000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,26.53870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,13.21290000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv index 1fef9b401..76b93450a 100644 --- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv +++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,12.62770000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,8.60100000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,10.46720000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,7.66660000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,9.14540000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,8.60100000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,8.09320000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,7.66660000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,12.62770000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,8.60100000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,10.46720000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,7.66660000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,9.14540000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,8.60100000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,8.09320000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,7.66660000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,5.96160000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,8.60100000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,5.81380000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,7.66660000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,7.40420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,8.60100000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,6.90620000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,7.66660000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,10.99990000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,6.76910000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,8.58470000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,5.24390000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,7.33320000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,6.76910000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,5.72310000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,5.24390000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,10.99990000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,6.76910000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,8.58470000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,5.24390000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,7.33320000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,6.76910000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,5.72310000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,5.24390000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,6.76910000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,5.24390000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,5.49990000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,6.76910000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,4.29230000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,5.24390000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,8.72900000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,5.30510000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,5.81930000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,5.30510000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,8.72900000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,5.30510000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,5.81930000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,5.30510000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,5.30510000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,4.36450000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,5.30510000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,11.42840000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,6.95640000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,7.61900000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,6.95640000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,11.42840000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,6.95640000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,7.61900000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,6.95640000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,6.95640000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,5.71420000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,6.95640000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,11.87490000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,7.14720000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,8.90040000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,5.38000000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,7.91660000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,7.14720000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,5.93360000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,5.38000000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,11.87490000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,7.14720000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,8.90040000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,5.38000000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,7.91660000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,7.14720000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,5.93360000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,5.38000000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,7.14720000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,5.38000000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,5.93740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,7.14720000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,4.45020000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,5.38000000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,11.66650000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,7.05870000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,8.99560000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,5.42090000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,7.77770000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,7.05870000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,5.99710000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,5.42090000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,11.66650000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,7.05870000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,8.99560000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,5.42090000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,7.77770000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,7.05870000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,5.99710000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,5.42090000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,4.00000000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,7.05870000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,3.04300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,5.42090000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,5.83330000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,7.05870000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,4.49780000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,5.42090000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv index 2958af3a8..7301cf34c 100644 --- a/tests/example_outputs/medium/Results/MCACapacity.csv +++ b/tests/example_outputs/medium/Results/MCACapacity.csv @@ -3,62 +3,62 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 A1,12.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025 +A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2025 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,28.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,25.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030 A1,4.00000000000,R1,2020,R1,residential,gasstove,newcapa,2030 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,21.33720000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,4.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 +A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,17.83930000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2030 +A1,5.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035 A1,11.00000000000,R1,2025,R1,residential,gasstove,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035 -A1,11.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,5.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035 +A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2035 A1,7.00000000000,R1,2030,R1,residential,gasstove,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040 -A1,7.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 -A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2040 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2040 +A1,8.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,14.00000000000,R1,2035,R1,residential,gasstove,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045 -A1,14.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 +A1,13.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045 +A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2045 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2045 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2045 +A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2045 A1,10.00000000000,R1,2040,R1,residential,gasstove,newcapa,2050 A1,17.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050 -A1,10.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 -A1,17.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,11.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 -A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 +A1,11.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050 +A1,16.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050 +A1,9.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,13.83720000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,0.49740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 -A1,5.66540000000,R1,2030,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2035,R1,gas,gassupply1,newcapa,2050 -A1,3.33330000000,R1,2040,R1,gas,gassupply1,newcapa,2050 -A1,6.66670000000,R1,2045,R1,gas,gassupply1,newcapa,2050 +A1,10.33930000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,5.28740000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,10.83330000000,R1,2030,R1,gas,gassupply1,newcapa,2050 +A1,0.20670000000,R1,2040,R1,gas,gassupply1,newcapa,2050 +A1,3.33330000000,R1,2045,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv index 646a3c9aa..63d4df954 100644 --- a/tests/example_outputs/medium/Results/MCAPrices.csv +++ b/tests/example_outputs/medium/Results/MCAPrices.csv @@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,29.11600000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,18.57780000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58960000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,11.24120000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,25.07480000000,R1,1,MUS$2010/PJ,2025 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,18.57780000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.97120000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,11.24120000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,29.11600000000,R1,2,MUS$2010/PJ,2025 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,18.57780000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58960000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,11.24120000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,25.07480000000,R1,3,MUS$2010/PJ,2025 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,18.57780000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.97120000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,11.24120000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,21.96620000000,R1,4,MUS$2010/PJ,2025 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,18.57780000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.35280000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,11.24120000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,23.05420000000,R1,5,MUS$2010/PJ,2025 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,18.57780000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.66200000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,11.24120000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2030 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,17.14260000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.96890000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.06410000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2030 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,17.14260000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.81250000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.06410000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2030 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,17.14260000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.96890000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.06410000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2030 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,17.14260000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.81250000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.06410000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,17.14260000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,7.65610000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.06410000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2030 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,17.14260000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,9.73430000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.06410000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,28.33300000000,R1,0,MUS$2010/PJ,2035 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,17.00770000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.32880000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,11.78430000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,18.88870000000,R1,1,MUS$2010/PJ,2035 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,17.00770000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,11.78430000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,28.33300000000,R1,2,MUS$2010/PJ,2035 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,17.00770000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.32880000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,11.78430000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,18.88870000000,R1,3,MUS$2010/PJ,2035 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,17.00770000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,11.78430000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,17.00770000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,11.78430000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,14.16650000000,R1,5,MUS$2010/PJ,2035 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,17.00770000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,11.78430000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,28.57110000000,R1,0,MUS$2010/PJ,2040 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,17.39110000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,15.66220000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,9.40050000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2040 -electricity,all-week,morning,all-year,19.04740000000,R1,1,MUS$2010/PJ,2040 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,17.39110000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,10.44150000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,9.40050000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2040 -electricity,all-week,afternoon,all-year,28.57110000000,R1,2,MUS$2010/PJ,2040 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,17.39110000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,15.66220000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,9.40050000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2040 -electricity,all-week,early-peak,all-year,19.04740000000,R1,3,MUS$2010/PJ,2040 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,17.39110000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,10.44150000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,9.40050000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,17.39110000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,9.40050000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2040 -electricity,all-week,evening,all-year,14.28550000000,R1,5,MUS$2010/PJ,2040 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,17.39110000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,7.83110000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,9.40050000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2040 -electricity,all-week,night,all-year,28.74960000000,R1,0,MUS$2010/PJ,2045 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,17.46810000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,15.75740000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,9.55380000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2045 -electricity,all-week,morning,all-year,19.16640000000,R1,1,MUS$2010/PJ,2045 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,17.46810000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.50500000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,9.55380000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2045 -electricity,all-week,afternoon,all-year,28.74960000000,R1,2,MUS$2010/PJ,2045 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,17.46810000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,15.75740000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,9.55380000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2045 -electricity,all-week,early-peak,all-year,19.16640000000,R1,3,MUS$2010/PJ,2045 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,17.46810000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.50500000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,9.55380000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,17.46810000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,9.55380000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2045 -electricity,all-week,evening,all-year,14.37480000000,R1,5,MUS$2010/PJ,2045 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,17.46810000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,7.87870000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,9.55380000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2045 -electricity,all-week,night,all-year,28.88850000000,R1,0,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,17.52790000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,15.82890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,9.58470000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -cook,all-week,night,all-year,6.87900000000,R1,0,MUS$2010/PJ,2050 -electricity,all-week,morning,all-year,19.25900000000,R1,1,MUS$2010/PJ,2050 +cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,17.52790000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.55260000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,9.58470000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -cook,all-week,morning,all-year,5.43600000000,R1,1,MUS$2010/PJ,2050 -electricity,all-week,afternoon,all-year,28.88850000000,R1,2,MUS$2010/PJ,2050 +cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,17.52790000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,15.82890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,9.58470000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -cook,all-week,afternoon,all-year,6.87900000000,R1,2,MUS$2010/PJ,2050 -electricity,all-week,early-peak,all-year,19.25900000000,R1,3,MUS$2010/PJ,2050 +cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,17.52790000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.55260000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,9.58470000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -cook,all-week,early-peak,all-year,5.43600000000,R1,3,MUS$2010/PJ,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,17.52790000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,9.58470000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -cook,all-week,late-peak,all-year,3.99300000000,R1,4,MUS$2010/PJ,2050 -electricity,all-week,evening,all-year,14.44430000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,17.52790000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,7.91440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,9.58470000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 -cook,all-week,evening,all-year,4.71450000000,R1,5,MUS$2010/PJ,2050 +cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050 diff --git a/tests/example_outputs/minimum_service/Results/MCAPrices.csv b/tests/example_outputs/minimum_service/Results/MCAPrices.csv index 0a01a70cd..85fd4acb7 100644 --- a/tests/example_outputs/minimum_service/Results/MCAPrices.csv +++ b/tests/example_outputs/minimum_service/Results/MCAPrices.csv @@ -14,96 +14,96 @@ ammonia,all-week,all-day,spring-autumn,321.15000000000,R1,2,MUS$2010/Mt,2010 fuel3,all-week,all-day,winter,0.06170000000,R1,0,MUS$2010/PJ,2015 fuel1,all-week,all-day,winter,1.08770000000,R1,0,MUS$2010/PJ,2015 fuel2,all-week,all-day,winter,9.51690000000,R1,0,MUS$2010/PJ,2015 -ammonia,all-week,all-day,winter,393.66450000000,R1,0,MUS$2010/Mt,2015 +ammonia,all-week,all-day,winter,393.51770000000,R1,0,MUS$2010/Mt,2015 fuel3,all-week,all-day,summer,0.06170000000,R1,1,MUS$2010/PJ,2015 fuel1,all-week,all-day,summer,1.08770000000,R1,1,MUS$2010/PJ,2015 fuel2,all-week,all-day,summer,9.51690000000,R1,1,MUS$2010/PJ,2015 -ammonia,all-week,all-day,summer,393.23270000000,R1,1,MUS$2010/Mt,2015 +ammonia,all-week,all-day,summer,393.51770000000,R1,1,MUS$2010/Mt,2015 fuel3,all-week,all-day,spring-autumn,0.06170000000,R1,2,MUS$2010/PJ,2015 fuel1,all-week,all-day,spring-autumn,1.08770000000,R1,2,MUS$2010/PJ,2015 fuel2,all-week,all-day,spring-autumn,9.51690000000,R1,2,MUS$2010/PJ,2015 -ammonia,all-week,all-day,spring-autumn,393.66450000000,R1,2,MUS$2010/Mt,2015 +ammonia,all-week,all-day,spring-autumn,393.51770000000,R1,2,MUS$2010/Mt,2015 fuel3,all-week,all-day,winter,0.07020000000,R1,0,MUS$2010/PJ,2020 fuel1,all-week,all-day,winter,1.17540000000,R1,0,MUS$2010/PJ,2020 fuel2,all-week,all-day,winter,9.48260000000,R1,0,MUS$2010/PJ,2020 -ammonia,all-week,all-day,winter,416.67530000000,R1,0,MUS$2010/Mt,2020 +ammonia,all-week,all-day,winter,416.52820000000,R1,0,MUS$2010/Mt,2020 fuel3,all-week,all-day,summer,0.07020000000,R1,1,MUS$2010/PJ,2020 fuel1,all-week,all-day,summer,1.17540000000,R1,1,MUS$2010/PJ,2020 fuel2,all-week,all-day,summer,9.48260000000,R1,1,MUS$2010/PJ,2020 -ammonia,all-week,all-day,summer,416.24270000000,R1,1,MUS$2010/Mt,2020 +ammonia,all-week,all-day,summer,416.52820000000,R1,1,MUS$2010/Mt,2020 fuel3,all-week,all-day,spring-autumn,0.07020000000,R1,2,MUS$2010/PJ,2020 fuel1,all-week,all-day,spring-autumn,1.17540000000,R1,2,MUS$2010/PJ,2020 fuel2,all-week,all-day,spring-autumn,9.48260000000,R1,2,MUS$2010/PJ,2020 -ammonia,all-week,all-day,spring-autumn,416.67530000000,R1,2,MUS$2010/Mt,2020 +ammonia,all-week,all-day,spring-autumn,416.52820000000,R1,2,MUS$2010/Mt,2020 fuel3,all-week,all-day,winter,0.08280000000,R1,0,MUS$2010/PJ,2025 fuel1,all-week,all-day,winter,1.16670000000,R1,0,MUS$2010/PJ,2025 fuel2,all-week,all-day,winter,10.71080000000,R1,0,MUS$2010/PJ,2025 -ammonia,all-week,all-day,winter,471.79630000000,R1,0,MUS$2010/Mt,2025 +ammonia,all-week,all-day,winter,471.64890000000,R1,0,MUS$2010/Mt,2025 fuel3,all-week,all-day,summer,0.08280000000,R1,1,MUS$2010/PJ,2025 fuel1,all-week,all-day,summer,1.16670000000,R1,1,MUS$2010/PJ,2025 fuel2,all-week,all-day,summer,10.71080000000,R1,1,MUS$2010/PJ,2025 -ammonia,all-week,all-day,summer,471.36280000000,R1,1,MUS$2010/Mt,2025 +ammonia,all-week,all-day,summer,471.64890000000,R1,1,MUS$2010/Mt,2025 fuel3,all-week,all-day,spring-autumn,0.08280000000,R1,2,MUS$2010/PJ,2025 fuel1,all-week,all-day,spring-autumn,1.16670000000,R1,2,MUS$2010/PJ,2025 fuel2,all-week,all-day,spring-autumn,10.71080000000,R1,2,MUS$2010/PJ,2025 -ammonia,all-week,all-day,spring-autumn,471.79630000000,R1,2,MUS$2010/Mt,2025 +ammonia,all-week,all-day,spring-autumn,471.64890000000,R1,2,MUS$2010/Mt,2025 fuel3,all-week,all-day,winter,0.09540000000,R1,0,MUS$2010/PJ,2030 fuel1,all-week,all-day,winter,1.15790000000,R1,0,MUS$2010/PJ,2030 fuel2,all-week,all-day,winter,11.93900000000,R1,0,MUS$2010/PJ,2030 -ammonia,all-week,all-day,winter,526.39780000000,R1,0,MUS$2010/Mt,2030 +ammonia,all-week,all-day,winter,526.25020000000,R1,0,MUS$2010/Mt,2030 fuel3,all-week,all-day,summer,0.09540000000,R1,1,MUS$2010/PJ,2030 fuel1,all-week,all-day,summer,1.15790000000,R1,1,MUS$2010/PJ,2030 fuel2,all-week,all-day,summer,11.93900000000,R1,1,MUS$2010/PJ,2030 -ammonia,all-week,all-day,summer,525.96350000000,R1,1,MUS$2010/Mt,2030 +ammonia,all-week,all-day,summer,526.25020000000,R1,1,MUS$2010/Mt,2030 fuel3,all-week,all-day,spring-autumn,0.09540000000,R1,2,MUS$2010/PJ,2030 fuel1,all-week,all-day,spring-autumn,1.15790000000,R1,2,MUS$2010/PJ,2030 fuel2,all-week,all-day,spring-autumn,11.93900000000,R1,2,MUS$2010/PJ,2030 -ammonia,all-week,all-day,spring-autumn,526.39780000000,R1,2,MUS$2010/Mt,2030 +ammonia,all-week,all-day,spring-autumn,526.25020000000,R1,2,MUS$2010/Mt,2030 fuel3,all-week,all-day,winter,0.09070000000,R1,0,MUS$2010/PJ,2035 fuel1,all-week,all-day,winter,1.14910000000,R1,0,MUS$2010/PJ,2035 fuel2,all-week,all-day,winter,11.81550000000,R1,0,MUS$2010/PJ,2035 -ammonia,all-week,all-day,winter,495.55460000000,R1,0,MUS$2010/Mt,2035 +ammonia,all-week,all-day,winter,495.40650000000,R1,0,MUS$2010/Mt,2035 fuel3,all-week,all-day,summer,0.09070000000,R1,1,MUS$2010/PJ,2035 fuel1,all-week,all-day,summer,1.14910000000,R1,1,MUS$2010/PJ,2035 fuel2,all-week,all-day,summer,11.81550000000,R1,1,MUS$2010/PJ,2035 -ammonia,all-week,all-day,summer,495.11890000000,R1,1,MUS$2010/Mt,2035 +ammonia,all-week,all-day,summer,495.40650000000,R1,1,MUS$2010/Mt,2035 fuel3,all-week,all-day,spring-autumn,0.09070000000,R1,2,MUS$2010/PJ,2035 fuel1,all-week,all-day,spring-autumn,1.14910000000,R1,2,MUS$2010/PJ,2035 fuel2,all-week,all-day,spring-autumn,11.81550000000,R1,2,MUS$2010/PJ,2035 -ammonia,all-week,all-day,spring-autumn,495.55460000000,R1,2,MUS$2010/Mt,2035 +ammonia,all-week,all-day,spring-autumn,495.40650000000,R1,2,MUS$2010/Mt,2035 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2040 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2040 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2040 -ammonia,all-week,all-day,winter,464.13770000000,R1,0,MUS$2010/Mt,2040 +ammonia,all-week,all-day,winter,463.98930000000,R1,0,MUS$2010/Mt,2040 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2040 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2040 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2040 -ammonia,all-week,all-day,summer,463.70110000000,R1,1,MUS$2010/Mt,2040 +ammonia,all-week,all-day,summer,463.98930000000,R1,1,MUS$2010/Mt,2040 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2040 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2040 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2040 -ammonia,all-week,all-day,spring-autumn,464.13770000000,R1,2,MUS$2010/Mt,2040 +ammonia,all-week,all-day,spring-autumn,463.98930000000,R1,2,MUS$2010/Mt,2040 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2045 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2045 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2045 -ammonia,all-week,all-day,winter,461.93710000000,R1,0,MUS$2010/Mt,2045 +ammonia,all-week,all-day,winter,461.78860000000,R1,0,MUS$2010/Mt,2045 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2045 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2045 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2045 -ammonia,all-week,all-day,summer,461.50050000000,R1,1,MUS$2010/Mt,2045 +ammonia,all-week,all-day,summer,461.78860000000,R1,1,MUS$2010/Mt,2045 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2045 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2045 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2045 -ammonia,all-week,all-day,spring-autumn,461.93710000000,R1,2,MUS$2010/Mt,2045 +ammonia,all-week,all-day,spring-autumn,461.78860000000,R1,2,MUS$2010/Mt,2045 fuel3,all-week,all-day,winter,0.08600000000,R1,0,MUS$2010/PJ,2050 fuel1,all-week,all-day,winter,1.14040000000,R1,0,MUS$2010/PJ,2050 fuel2,all-week,all-day,winter,11.69200000000,R1,0,MUS$2010/PJ,2050 -ammonia,all-week,all-day,winter,459.71170000000,R1,0,MUS$2010/Mt,2050 +ammonia,all-week,all-day,winter,459.56320000000,R1,0,MUS$2010/Mt,2050 fuel3,all-week,all-day,summer,0.08600000000,R1,1,MUS$2010/PJ,2050 fuel1,all-week,all-day,summer,1.14040000000,R1,1,MUS$2010/PJ,2050 fuel2,all-week,all-day,summer,11.69200000000,R1,1,MUS$2010/PJ,2050 -ammonia,all-week,all-day,summer,459.27510000000,R1,1,MUS$2010/Mt,2050 +ammonia,all-week,all-day,summer,459.56320000000,R1,1,MUS$2010/Mt,2050 fuel3,all-week,all-day,spring-autumn,0.08600000000,R1,2,MUS$2010/PJ,2050 fuel1,all-week,all-day,spring-autumn,1.14040000000,R1,2,MUS$2010/PJ,2050 fuel2,all-week,all-day,spring-autumn,11.69200000000,R1,2,MUS$2010/PJ,2050 -ammonia,all-week,all-day,spring-autumn,459.71170000000,R1,2,MUS$2010/Mt,2050 +ammonia,all-week,all-day,spring-autumn,459.56320000000,R1,2,MUS$2010/Mt,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv index fcffde024..cdad299b3 100644 --- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv +++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv @@ -3,56 +3,73 @@ A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 -A1,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A2,12.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 -A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 -A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025 -A1,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025 +A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2025 +A1,7.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2025 +A1,18.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2025 +A1,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A2,9.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2030 +A2,9.50000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 -A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 -A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2030 +A1,10.63440000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2030 A1,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2035 +A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 A2,5.50000000000,R1,2025,R1,residential,heatpump,newcapa,2035 -A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2035 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 -A1,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A1,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2035 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2035 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2035 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2035 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2035 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2035 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2035 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2035 +A1,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A2,4.31420000000,R1,2030,R1,residential,gasboiler,newcapa,2040 -A2,8.18580000000,R1,2030,R1,residential,heatpump,newcapa,2040 +A2,12.50000000000,R1,2030,R1,residential,heatpump,newcapa,2040 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2040 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2040 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2040 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 A2,8.50000000000,R1,2035,R1,residential,heatpump,newcapa,2045 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2045 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2045 +A1,1.00000000000,R1,2020,R1,power,windturbine,newcapa,2045 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2045 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2045 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045 -A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2045 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2045 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2045 A1,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A1,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 A2,15.50000000000,R1,2040,R1,residential,heatpump,newcapa,2050 A2,11.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050 -A1,10.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 -A1,17.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 +A1,6.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2050 +A1,3.00000000000,R1,2025,R1,power,gasCCGT,newcapa,2050 +A1,6.00000000000,R1,2025,R1,power,windturbine,newcapa,2050 +A1,8.00000000000,R1,2030,R1,power,windturbine,newcapa,2050 A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050 -A1,15.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 -A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 -A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050 -A1,1.05560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050 +A1,7.00000000000,R1,2045,R1,power,windturbine,newcapa,2050 +A1,3.13440000000,R1,2020,R1,gas,gassupply1,newcapa,2050 +A1,4.39560000000,R1,2025,R1,gas,gassupply1,newcapa,2050 +A1,7.50000000000,R1,2030,R1,gas,gassupply1,newcapa,2050 diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv index 23c05a431..6b2d01f5b 100644 --- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv +++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv @@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020 -electricity,all-week,night,all-year,29.26230000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,19.57510000000,R1,0,MUS$2010/PJ,2025 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,12.58300000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,10.72190000000,R1,0,MUS$2010/PJ,2025 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025 -electricity,all-week,morning,all-year,20.51690000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,19.57510000000,R1,1,MUS$2010/PJ,2025 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,11.96460000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,10.72190000000,R1,1,MUS$2010/PJ,2025 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025 -electricity,all-week,afternoon,all-year,29.26230000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,19.57510000000,R1,2,MUS$2010/PJ,2025 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,12.58300000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,10.72190000000,R1,2,MUS$2010/PJ,2025 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025 -electricity,all-week,early-peak,all-year,20.51690000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,19.57510000000,R1,3,MUS$2010/PJ,2025 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,11.96460000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,10.72190000000,R1,3,MUS$2010/PJ,2025 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025 -electricity,all-week,late-peak,all-year,12.13090000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,19.57510000000,R1,4,MUS$2010/PJ,2025 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,11.34610000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,10.72190000000,R1,4,MUS$2010/PJ,2025 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025 -electricity,all-week,evening,all-year,16.14420000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,19.57510000000,R1,5,MUS$2010/PJ,2025 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,11.65540000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,10.72190000000,R1,5,MUS$2010/PJ,2025 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025 -electricity,all-week,night,all-year,27.27240000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,21.60150000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,15.06990000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,11.23800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,18.18160000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,21.60150000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,12.81590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,11.23800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,afternoon,all-year,27.27240000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,21.60150000000,R1,2,MUS$2010/PJ,2030 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,15.06990000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,11.23800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,18.18160000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,21.60150000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,12.81590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,11.23800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,21.60150000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,10.69510000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,11.23800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,13.63620000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,21.60150000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.68880000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,11.23800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,night,all-year,29.59240000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,24.10090000000,R1,0,MUS$2010/PJ,2035 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,16.77770000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,12.23780000000,R1,0,MUS$2010/PJ,2035 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035 -electricity,all-week,morning,all-year,19.72830000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,24.10090000000,R1,1,MUS$2010/PJ,2035 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,12.53230000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,12.23780000000,R1,1,MUS$2010/PJ,2035 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035 -electricity,all-week,afternoon,all-year,29.59240000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,24.10090000000,R1,2,MUS$2010/PJ,2035 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,16.77770000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,12.23780000000,R1,2,MUS$2010/PJ,2035 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035 -electricity,all-week,early-peak,all-year,19.72830000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,24.10090000000,R1,3,MUS$2010/PJ,2035 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,12.53230000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,12.23780000000,R1,3,MUS$2010/PJ,2035 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,24.10090000000,R1,4,MUS$2010/PJ,2035 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,8.32830000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,12.23780000000,R1,4,MUS$2010/PJ,2035 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035 -electricity,all-week,evening,all-year,14.79620000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,24.10090000000,R1,5,MUS$2010/PJ,2035 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,10.40970000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,12.23780000000,R1,5,MUS$2010/PJ,2035 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035 -electricity,all-week,night,all-year,29.66560000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,25.80410000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,17.48300000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.91910000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,19.77710000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,25.80410000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,13.06660000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.91910000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,afternoon,all-year,29.66560000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,afternoon,all-year,25.80410000000,R1,2,MUS$2010/PJ,2040 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,afternoon,all-year,17.48300000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,afternoon,all-year,12.91910000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,19.77710000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,25.80410000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,13.06660000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.91910000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,25.80410000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,8.68550000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.91910000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,14.83280000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,25.80410000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,10.85840000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.91910000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2045 +electricity,all-week,night,all-year,27.99370000000,R1,0,MUS$2010/PJ,2045 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045 -heat,all-week,night,all-year,16.19530000000,R1,0,MUS$2010/PJ,2045 +heat,all-week,night,all-year,13.79490000000,R1,0,MUS$2010/PJ,2045 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2045 +electricity,all-week,morning,all-year,27.99370000000,R1,1,MUS$2010/PJ,2045 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045 -heat,all-week,morning,all-year,10.79690000000,R1,1,MUS$2010/PJ,2045 +heat,all-week,morning,all-year,13.79490000000,R1,1,MUS$2010/PJ,2045 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2045 +electricity,all-week,afternoon,all-year,27.99370000000,R1,2,MUS$2010/PJ,2045 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045 -heat,all-week,afternoon,all-year,16.19530000000,R1,2,MUS$2010/PJ,2045 +heat,all-week,afternoon,all-year,13.79490000000,R1,2,MUS$2010/PJ,2045 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2045 +electricity,all-week,early-peak,all-year,27.99370000000,R1,3,MUS$2010/PJ,2045 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045 -heat,all-week,early-peak,all-year,10.79690000000,R1,3,MUS$2010/PJ,2045 +heat,all-week,early-peak,all-year,13.79490000000,R1,3,MUS$2010/PJ,2045 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2045 +electricity,all-week,late-peak,all-year,27.99370000000,R1,4,MUS$2010/PJ,2045 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2045 +heat,all-week,late-peak,all-year,13.79490000000,R1,4,MUS$2010/PJ,2045 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2045 +electricity,all-week,evening,all-year,27.99370000000,R1,5,MUS$2010/PJ,2045 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045 -heat,all-week,evening,all-year,8.09760000000,R1,5,MUS$2010/PJ,2045 +heat,all-week,evening,all-year,13.79490000000,R1,5,MUS$2010/PJ,2045 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045 -electricity,all-week,night,all-year,29.99960000000,R1,0,MUS$2010/PJ,2050 +electricity,all-week,night,all-year,29.69170000000,R1,0,MUS$2010/PJ,2050 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050 -heat,all-week,night,all-year,16.32890000000,R1,0,MUS$2010/PJ,2050 +heat,all-week,night,all-year,14.47410000000,R1,0,MUS$2010/PJ,2050 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050 -electricity,all-week,morning,all-year,19.99980000000,R1,1,MUS$2010/PJ,2050 +electricity,all-week,morning,all-year,29.69170000000,R1,1,MUS$2010/PJ,2050 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050 -heat,all-week,morning,all-year,10.88590000000,R1,1,MUS$2010/PJ,2050 +heat,all-week,morning,all-year,14.47410000000,R1,1,MUS$2010/PJ,2050 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050 -electricity,all-week,afternoon,all-year,29.99960000000,R1,2,MUS$2010/PJ,2050 +electricity,all-week,afternoon,all-year,29.69170000000,R1,2,MUS$2010/PJ,2050 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050 -heat,all-week,afternoon,all-year,16.32890000000,R1,2,MUS$2010/PJ,2050 +heat,all-week,afternoon,all-year,14.47410000000,R1,2,MUS$2010/PJ,2050 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050 -electricity,all-week,early-peak,all-year,19.99980000000,R1,3,MUS$2010/PJ,2050 +electricity,all-week,early-peak,all-year,29.69170000000,R1,3,MUS$2010/PJ,2050 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050 -heat,all-week,early-peak,all-year,10.88590000000,R1,3,MUS$2010/PJ,2050 +heat,all-week,early-peak,all-year,14.47410000000,R1,3,MUS$2010/PJ,2050 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050 -electricity,all-week,late-peak,all-year,9.99990000000,R1,4,MUS$2010/PJ,2050 +electricity,all-week,late-peak,all-year,29.69170000000,R1,4,MUS$2010/PJ,2050 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050 -heat,all-week,late-peak,all-year,5.44300000000,R1,4,MUS$2010/PJ,2050 +heat,all-week,late-peak,all-year,14.47410000000,R1,4,MUS$2010/PJ,2050 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050 -electricity,all-week,evening,all-year,14.99980000000,R1,5,MUS$2010/PJ,2050 +electricity,all-week,evening,all-year,29.69170000000,R1,5,MUS$2010/PJ,2050 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050 -heat,all-week,evening,all-year,8.16440000000,R1,5,MUS$2010/PJ,2050 +heat,all-week,evening,all-year,14.47410000000,R1,5,MUS$2010/PJ,2050 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050 diff --git a/tests/example_outputs/trade/Results/MCAPrices.csv b/tests/example_outputs/trade/Results/MCAPrices.csv index df717c78a..118984620 100644 --- a/tests/example_outputs/trade/Results/MCAPrices.csv +++ b/tests/example_outputs/trade/Results/MCAPrices.csv @@ -23,111 +23,111 @@ electricity,all-week,evening,all-year,13.98150000000,R1,5,MUS$2010/PJ,2020 electricity,all-week,evening,all-year,19.13890000000,R2,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R1,5,MUS$2010/PJ,2020 gas,all-week,evening,all-year,4.71680000000,R2,5,MUS$2010/PJ,2020 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,23.60400000000,R1,0,MUS$2010/PJ,2025 -gas,all-week,night,all-year,114.76360000000,R2,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,23.36440000000,R1,0,MUS$2010/PJ,2025 -heat,all-week,night,all-year,174.63580000000,R2,0,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2025 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,19.95270000000,R1,1,MUS$2010/PJ,2025 -gas,all-week,morning,all-year,105.34210000000,R2,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,19.80280000000,R1,1,MUS$2010/PJ,2025 -heat,all-week,morning,all-year,159.98100000000,R2,1,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2025 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,22.89470000000,R1,2,MUS$2010/PJ,2025 -gas,all-week,afternoon,all-year,126.27890000000,R2,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,22.67250000000,R1,2,MUS$2010/PJ,2025 -heat,all-week,afternoon,all-year,192.54730000000,R2,2,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2025 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,22.89470000000,R1,3,MUS$2010/PJ,2025 -gas,all-week,early-peak,all-year,126.27890000000,R2,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,22.67250000000,R1,3,MUS$2010/PJ,2025 -heat,all-week,early-peak,all-year,192.54730000000,R2,3,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2025 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,19.27370000000,R1,4,MUS$2010/PJ,2025 -gas,all-week,late-peak,all-year,101.24580000000,R2,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,19.14060000000,R1,4,MUS$2010/PJ,2025 -heat,all-week,late-peak,all-year,153.60930000000,R2,4,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2025 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,22.92520000000,R1,5,MUS$2010/PJ,2025 -gas,all-week,evening,all-year,126.27890000000,R2,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,22.70220000000,R1,5,MUS$2010/PJ,2025 -heat,all-week,evening,all-year,192.54730000000,R2,5,MUS$2010/PJ,2025 -electricity,all-week,night,all-year,117.23020000000,R1,0,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,117.23020000000,R2,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,32.84270000000,R1,0,MUS$2010/PJ,2030 -gas,all-week,night,all-year,163.53120000000,R2,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,34.10390000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,245.46200000000,R2,0,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R1,1,MUS$2010/PJ,2030 -electricity,all-week,morning,all-year,105.45240000000,R2,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,27.36570000000,R1,1,MUS$2010/PJ,2030 -gas,all-week,morning,all-year,149.94900000000,R2,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,28.42040000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,224.74900000000,R2,1,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R1,2,MUS$2010/PJ,2030 -electricity,all-week,afternoon,all-year,126.35930000000,R2,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,31.77870000000,R1,2,MUS$2010/PJ,2030 -gas,all-week,afternoon,all-year,180.13170000000,R2,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,32.99980000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,afternoon,all-year,270.77800000000,R2,2,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R1,3,MUS$2010/PJ,2030 -electricity,all-week,early-peak,all-year,126.35930000000,R2,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,31.77870000000,R1,3,MUS$2010/PJ,2030 -gas,all-week,early-peak,all-year,180.13170000000,R2,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,32.99980000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,270.77800000000,R2,3,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R1,4,MUS$2010/PJ,2030 -electricity,all-week,late-peak,all-year,101.25670000000,R2,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,26.34730000000,R1,4,MUS$2010/PJ,2030 -gas,all-week,late-peak,all-year,144.04360000000,R2,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,27.36360000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,215.74330000000,R2,4,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R1,5,MUS$2010/PJ,2030 -electricity,all-week,evening,all-year,126.39030000000,R2,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,31.82450000000,R1,5,MUS$2010/PJ,2030 -gas,all-week,evening,all-year,180.13170000000,R2,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,33.04730000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,270.77800000000,R2,5,MUS$2010/PJ,2030 -electricity,all-week,night,all-year,8685.55900000000,R1,0,MUS$2010/PJ,2035 -electricity,all-week,night,all-year,8685.55900000000,R2,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,46.70080000000,R1,0,MUS$2010/PJ,2035 -gas,all-week,night,all-year,215.11500000000,R2,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,50.20940000000,R1,0,MUS$2010/PJ,2035 -heat,all-week,night,all-year,327.13430000000,R2,0,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R1,1,MUS$2010/PJ,2035 -electricity,all-week,morning,all-year,7800.08140000000,R2,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,38.48530000000,R1,1,MUS$2010/PJ,2035 -gas,all-week,morning,all-year,197.25240000000,R2,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,41.34410000000,R1,1,MUS$2010/PJ,2035 -heat,all-week,morning,all-year,299.56730000000,R2,1,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R1,2,MUS$2010/PJ,2035 -electricity,all-week,afternoon,all-year,9566.88680000000,R2,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,45.10480000000,R1,2,MUS$2010/PJ,2035 -gas,all-week,afternoon,all-year,236.94710000000,R2,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,48.48720000000,R1,2,MUS$2010/PJ,2035 -heat,all-week,afternoon,all-year,360.82720000000,R2,2,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R1,3,MUS$2010/PJ,2035 -electricity,all-week,early-peak,all-year,9566.88680000000,R2,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,45.10480000000,R1,3,MUS$2010/PJ,2035 -gas,all-week,early-peak,all-year,236.94710000000,R2,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,48.48720000000,R1,3,MUS$2010/PJ,2035 -heat,all-week,early-peak,all-year,360.82720000000,R2,3,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R1,4,MUS$2010/PJ,2035 -electricity,all-week,late-peak,all-year,7450.38850000000,R2,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,36.95770000000,R1,4,MUS$2010/PJ,2035 -gas,all-week,late-peak,all-year,189.48610000000,R2,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,39.69570000000,R1,4,MUS$2010/PJ,2035 -heat,all-week,late-peak,all-year,287.58170000000,R2,4,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R1,5,MUS$2010/PJ,2035 -electricity,all-week,evening,all-year,9568.07120000000,R2,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,45.17340000000,R1,5,MUS$2010/PJ,2035 -gas,all-week,evening,all-year,236.94710000000,R2,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,48.56120000000,R1,5,MUS$2010/PJ,2035 -heat,all-week,evening,all-year,360.82720000000,R2,5,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,21.63640000000,R1,0,MUS$2010/PJ,2025 +gas,all-week,night,all-year,115.63450000000,R2,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,21.44510000000,R1,0,MUS$2010/PJ,2025 +heat,all-week,night,all-year,175.99040000000,R2,0,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2025 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,21.63640000000,R1,1,MUS$2010/PJ,2025 +gas,all-week,morning,all-year,115.63450000000,R2,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,21.44510000000,R1,1,MUS$2010/PJ,2025 +heat,all-week,morning,all-year,175.99040000000,R2,1,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2025 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,21.63640000000,R1,2,MUS$2010/PJ,2025 +gas,all-week,afternoon,all-year,115.63450000000,R2,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,21.44510000000,R1,2,MUS$2010/PJ,2025 +heat,all-week,afternoon,all-year,175.99040000000,R2,2,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2025 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,21.63640000000,R1,3,MUS$2010/PJ,2025 +gas,all-week,early-peak,all-year,115.63450000000,R2,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,21.44510000000,R1,3,MUS$2010/PJ,2025 +heat,all-week,early-peak,all-year,175.99040000000,R2,3,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2025 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,21.63640000000,R1,4,MUS$2010/PJ,2025 +gas,all-week,late-peak,all-year,115.63450000000,R2,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,21.44510000000,R1,4,MUS$2010/PJ,2025 +heat,all-week,late-peak,all-year,175.99040000000,R2,4,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2025 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,21.63640000000,R1,5,MUS$2010/PJ,2025 +gas,all-week,evening,all-year,115.63450000000,R2,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,21.44510000000,R1,5,MUS$2010/PJ,2025 +heat,all-week,evening,all-year,175.99040000000,R2,5,MUS$2010/PJ,2025 +electricity,all-week,night,all-year,115.97190000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,115.97190000000,R2,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,29.89130000000,R1,0,MUS$2010/PJ,2030 +gas,all-week,night,all-year,164.78670000000,R2,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,31.04120000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,247.37670000000,R2,0,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,115.97190000000,R2,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,29.89130000000,R1,1,MUS$2010/PJ,2030 +gas,all-week,morning,all-year,164.78670000000,R2,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,31.04120000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,247.37670000000,R2,1,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,afternoon,all-year,115.97190000000,R2,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,29.89130000000,R1,2,MUS$2010/PJ,2030 +gas,all-week,afternoon,all-year,164.78670000000,R2,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,31.04120000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,afternoon,all-year,247.37670000000,R2,2,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,115.97190000000,R2,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,29.89130000000,R1,3,MUS$2010/PJ,2030 +gas,all-week,early-peak,all-year,164.78670000000,R2,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,31.04120000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,247.37670000000,R2,3,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,115.97190000000,R2,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,29.89130000000,R1,4,MUS$2010/PJ,2030 +gas,all-week,late-peak,all-year,164.78670000000,R2,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,31.04120000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,247.37670000000,R2,4,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,115.97190000000,R2,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,29.89130000000,R1,5,MUS$2010/PJ,2030 +gas,all-week,evening,all-year,164.78670000000,R2,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,31.04120000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,247.37670000000,R2,5,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,8677.86150000000,R1,0,MUS$2010/PJ,2035 +electricity,all-week,night,all-year,8677.86150000000,R2,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,42.27370000000,R1,0,MUS$2010/PJ,2035 +gas,all-week,night,all-year,216.76620000000,R2,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,45.43210000000,R1,0,MUS$2010/PJ,2035 +heat,all-week,night,all-year,329.68250000000,R2,0,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R1,1,MUS$2010/PJ,2035 +electricity,all-week,morning,all-year,8677.86150000000,R2,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,42.27370000000,R1,1,MUS$2010/PJ,2035 +gas,all-week,morning,all-year,216.76620000000,R2,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,45.43210000000,R1,1,MUS$2010/PJ,2035 +heat,all-week,morning,all-year,329.68250000000,R2,1,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R1,2,MUS$2010/PJ,2035 +electricity,all-week,afternoon,all-year,8677.86150000000,R2,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,42.27370000000,R1,2,MUS$2010/PJ,2035 +gas,all-week,afternoon,all-year,216.76620000000,R2,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,45.43210000000,R1,2,MUS$2010/PJ,2035 +heat,all-week,afternoon,all-year,329.68250000000,R2,2,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R1,3,MUS$2010/PJ,2035 +electricity,all-week,early-peak,all-year,8677.86150000000,R2,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,42.27370000000,R1,3,MUS$2010/PJ,2035 +gas,all-week,early-peak,all-year,216.76620000000,R2,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,45.43210000000,R1,3,MUS$2010/PJ,2035 +heat,all-week,early-peak,all-year,329.68250000000,R2,3,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R1,4,MUS$2010/PJ,2035 +electricity,all-week,late-peak,all-year,8677.86150000000,R2,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,42.27370000000,R1,4,MUS$2010/PJ,2035 +gas,all-week,late-peak,all-year,216.76620000000,R2,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,45.43210000000,R1,4,MUS$2010/PJ,2035 +heat,all-week,late-peak,all-year,329.68250000000,R2,4,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R1,5,MUS$2010/PJ,2035 +electricity,all-week,evening,all-year,8677.86150000000,R2,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,42.27370000000,R1,5,MUS$2010/PJ,2035 +gas,all-week,evening,all-year,216.76620000000,R2,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,45.43210000000,R1,5,MUS$2010/PJ,2035 +heat,all-week,evening,all-year,329.68250000000,R2,5,MUS$2010/PJ,2035 From 5f8141ac975e05b6cf23fba220018115612cd72d Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 18 Dec 2024 14:14:52 +0000 Subject: [PATCH 4/5] Revert changed model --- .../Results/MCACapacity.csv | 125 +++---- .../Results/MCAPrices.csv | 320 +++++++++--------- .../technodata/power/Technodata.csv | 4 +- 3 files changed, 227 insertions(+), 222 deletions(-) diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv index d0d8822bd..7f8f5eb37 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv @@ -4,63 +4,67 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2022 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 -A1,16.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2022 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2022 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2024 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2024 -A1,4.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 +A1,2.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2024 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2024 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2026 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2026 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2026 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2026 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2026 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2026 +A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2026 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2028 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2028 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2028 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2028 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2028 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 -A1,12.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2028 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2028 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2028 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2028 +A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2028 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2028 A1,11.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2030 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2030 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2030 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2030 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2030 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2030 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 -A1,9.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2030 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2030 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2030 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2030 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2030 +A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2030 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2030 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2030 A1,4.00000000000,R1,2022,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2032 A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2032 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2032 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2032 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2032 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2032 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2032 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 -A1,6.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2032 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2032 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2032 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2032 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2032 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2032 +A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2032 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2032 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2032 A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2032 A1,4.00000000000,R1,2024,R1,residential,heatpump,newcapa,2034 @@ -68,16 +72,17 @@ A1,4.00000000000,R1,2026,R1,residential,heatpump,newcapa,2034 A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2034 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2034 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2034 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2034 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2034 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2034 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2034 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2034 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2034 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2034 A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2034 -A1,3.49110000000,R1,2020,R1,gas,gassupply1,newcapa,2034 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2034 +A1,1.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2034 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2034 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2034 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2034 A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2034 A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2034 @@ -86,17 +91,17 @@ A1,5.00000000000,R1,2028,R1,residential,heatpump,newcapa,2036 A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2036 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2036 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2036 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2036 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2036 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2036 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2036 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2036 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2036 A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2036 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2036 -A1,1.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2036 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2036 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2036 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2036 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2036 A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2036 A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2036 @@ -106,13 +111,13 @@ A1,13.00000000000,R1,2030,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2038 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2038 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2038 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2038 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2038 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2038 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2038 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2038 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2038 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2038 @@ -121,19 +126,19 @@ A1,6.00000000000,R1,2032,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2034,R1,residential,heatpump,newcapa,2040 A1,6.00000000000,R1,2036,R1,residential,heatpump,newcapa,2040 A1,8.00000000000,R1,2038,R1,residential,heatpump,newcapa,2040 -A1,3.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 -A1,1.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 +A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2040 +A1,2.00000000000,R1,2022,R1,power,gasCCGT,newcapa,2040 A1,2.00000000000,R1,2024,R1,power,gasCCGT,newcapa,2040 -A1,3.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 -A1,2.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 -A1,5.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 -A1,2.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 +A1,2.00000000000,R1,2026,R1,power,gasCCGT,newcapa,2040 +A1,5.00000000000,R1,2020,R1,power,windturbine,newcapa,2040 +A1,6.00000000000,R1,2028,R1,power,windturbine,newcapa,2040 +A1,3.00000000000,R1,2030,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2032,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2034,R1,power,windturbine,newcapa,2040 A1,2.00000000000,R1,2036,R1,power,windturbine,newcapa,2040 A1,3.00000000000,R1,2038,R1,power,windturbine,newcapa,2040 -A1,1.99110000000,R1,2020,R1,gas,gassupply1,newcapa,2040 -A1,5.11670000000,R1,2026,R1,gas,gassupply1,newcapa,2040 +A1,0.00560000000,R1,2024,R1,gas,gassupply1,newcapa,2040 +A1,3.76220000000,R1,2026,R1,gas,gassupply1,newcapa,2040 A1,0.42220000000,R1,2028,R1,gas,gassupply1,newcapa,2040 A1,3.00000000000,R1,2030,R1,gas,gassupply1,newcapa,2040 A1,3.00000000000,R1,2032,R1,gas,gassupply1,newcapa,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv index 66e93afd5..df9e17239 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv @@ -31,323 +31,323 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020 -electricity,all-week,night,all-year,17.84810000000,R1,0,MUS$2010/PJ,2022 +electricity,all-week,night,all-year,16.36400000000,R1,0,MUS$2010/PJ,2022 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022 -heat,all-week,night,all-year,9.94130000000,R1,0,MUS$2010/PJ,2022 +heat,all-week,night,all-year,9.59760000000,R1,0,MUS$2010/PJ,2022 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022 -electricity,all-week,morning,all-year,17.84810000000,R1,1,MUS$2010/PJ,2022 +electricity,all-week,morning,all-year,16.36400000000,R1,1,MUS$2010/PJ,2022 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022 -heat,all-week,morning,all-year,9.94130000000,R1,1,MUS$2010/PJ,2022 +heat,all-week,morning,all-year,9.59760000000,R1,1,MUS$2010/PJ,2022 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022 -electricity,all-week,mid-afternoon,all-year,17.84810000000,R1,2,MUS$2010/PJ,2022 +electricity,all-week,mid-afternoon,all-year,16.36400000000,R1,2,MUS$2010/PJ,2022 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022 -heat,all-week,mid-afternoon,all-year,9.94130000000,R1,2,MUS$2010/PJ,2022 +heat,all-week,mid-afternoon,all-year,9.59760000000,R1,2,MUS$2010/PJ,2022 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022 -electricity,all-week,early-peak,all-year,17.84810000000,R1,3,MUS$2010/PJ,2022 +electricity,all-week,early-peak,all-year,16.36400000000,R1,3,MUS$2010/PJ,2022 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022 -heat,all-week,early-peak,all-year,9.94130000000,R1,3,MUS$2010/PJ,2022 +heat,all-week,early-peak,all-year,9.59760000000,R1,3,MUS$2010/PJ,2022 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022 -electricity,all-week,late-peak,all-year,17.84810000000,R1,4,MUS$2010/PJ,2022 +electricity,all-week,late-peak,all-year,16.36400000000,R1,4,MUS$2010/PJ,2022 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022 -heat,all-week,late-peak,all-year,9.94130000000,R1,4,MUS$2010/PJ,2022 +heat,all-week,late-peak,all-year,9.59760000000,R1,4,MUS$2010/PJ,2022 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022 -electricity,all-week,evening,all-year,17.84810000000,R1,5,MUS$2010/PJ,2022 +electricity,all-week,evening,all-year,16.36400000000,R1,5,MUS$2010/PJ,2022 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022 -heat,all-week,evening,all-year,9.94130000000,R1,5,MUS$2010/PJ,2022 +heat,all-week,evening,all-year,9.59760000000,R1,5,MUS$2010/PJ,2022 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022 -electricity,all-week,early-morning,all-year,17.84810000000,R1,6,MUS$2010/PJ,2022 +electricity,all-week,early-morning,all-year,16.36400000000,R1,6,MUS$2010/PJ,2022 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022 -heat,all-week,early-morning,all-year,9.94130000000,R1,6,MUS$2010/PJ,2022 +heat,all-week,early-morning,all-year,9.59760000000,R1,6,MUS$2010/PJ,2022 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022 -electricity,all-week,late-afternoon,all-year,17.84810000000,R1,7,MUS$2010/PJ,2022 +electricity,all-week,late-afternoon,all-year,16.36400000000,R1,7,MUS$2010/PJ,2022 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022 -heat,all-week,late-afternoon,all-year,9.94130000000,R1,7,MUS$2010/PJ,2022 +heat,all-week,late-afternoon,all-year,9.59760000000,R1,7,MUS$2010/PJ,2022 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022 -electricity,all-week,night,all-year,18.34290000000,R1,0,MUS$2010/PJ,2024 +electricity,all-week,night,all-year,18.03310000000,R1,0,MUS$2010/PJ,2024 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024 -heat,all-week,night,all-year,10.23890000000,R1,0,MUS$2010/PJ,2024 +heat,all-week,night,all-year,10.15040000000,R1,0,MUS$2010/PJ,2024 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024 -electricity,all-week,morning,all-year,18.34290000000,R1,1,MUS$2010/PJ,2024 +electricity,all-week,morning,all-year,18.03310000000,R1,1,MUS$2010/PJ,2024 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024 -heat,all-week,morning,all-year,10.23890000000,R1,1,MUS$2010/PJ,2024 +heat,all-week,morning,all-year,10.15040000000,R1,1,MUS$2010/PJ,2024 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024 -electricity,all-week,mid-afternoon,all-year,18.34290000000,R1,2,MUS$2010/PJ,2024 +electricity,all-week,mid-afternoon,all-year,18.03310000000,R1,2,MUS$2010/PJ,2024 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024 -heat,all-week,mid-afternoon,all-year,10.23890000000,R1,2,MUS$2010/PJ,2024 +heat,all-week,mid-afternoon,all-year,10.15040000000,R1,2,MUS$2010/PJ,2024 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024 -electricity,all-week,early-peak,all-year,18.34290000000,R1,3,MUS$2010/PJ,2024 +electricity,all-week,early-peak,all-year,18.03310000000,R1,3,MUS$2010/PJ,2024 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024 -heat,all-week,early-peak,all-year,10.23890000000,R1,3,MUS$2010/PJ,2024 +heat,all-week,early-peak,all-year,10.15040000000,R1,3,MUS$2010/PJ,2024 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024 -electricity,all-week,late-peak,all-year,18.34290000000,R1,4,MUS$2010/PJ,2024 +electricity,all-week,late-peak,all-year,18.03310000000,R1,4,MUS$2010/PJ,2024 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024 -heat,all-week,late-peak,all-year,10.23890000000,R1,4,MUS$2010/PJ,2024 +heat,all-week,late-peak,all-year,10.15040000000,R1,4,MUS$2010/PJ,2024 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024 -electricity,all-week,evening,all-year,18.34290000000,R1,5,MUS$2010/PJ,2024 +electricity,all-week,evening,all-year,18.03310000000,R1,5,MUS$2010/PJ,2024 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024 -heat,all-week,evening,all-year,10.23890000000,R1,5,MUS$2010/PJ,2024 +heat,all-week,evening,all-year,10.15040000000,R1,5,MUS$2010/PJ,2024 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024 -electricity,all-week,early-morning,all-year,18.34290000000,R1,6,MUS$2010/PJ,2024 +electricity,all-week,early-morning,all-year,18.03310000000,R1,6,MUS$2010/PJ,2024 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024 -heat,all-week,early-morning,all-year,10.23890000000,R1,6,MUS$2010/PJ,2024 +heat,all-week,early-morning,all-year,10.15040000000,R1,6,MUS$2010/PJ,2024 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024 -electricity,all-week,late-afternoon,all-year,18.34290000000,R1,7,MUS$2010/PJ,2024 +electricity,all-week,late-afternoon,all-year,18.03310000000,R1,7,MUS$2010/PJ,2024 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024 -heat,all-week,late-afternoon,all-year,10.23890000000,R1,7,MUS$2010/PJ,2024 +heat,all-week,late-afternoon,all-year,10.15040000000,R1,7,MUS$2010/PJ,2024 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024 -electricity,all-week,night,all-year,19.19800000000,R1,0,MUS$2010/PJ,2026 +electricity,all-week,night,all-year,18.50630000000,R1,0,MUS$2010/PJ,2026 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026 -heat,all-week,night,all-year,10.50420000000,R1,0,MUS$2010/PJ,2026 +heat,all-week,night,all-year,10.27560000000,R1,0,MUS$2010/PJ,2026 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026 -electricity,all-week,morning,all-year,19.19800000000,R1,1,MUS$2010/PJ,2026 +electricity,all-week,morning,all-year,18.50630000000,R1,1,MUS$2010/PJ,2026 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026 -heat,all-week,morning,all-year,10.50420000000,R1,1,MUS$2010/PJ,2026 +heat,all-week,morning,all-year,10.27560000000,R1,1,MUS$2010/PJ,2026 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026 -electricity,all-week,mid-afternoon,all-year,19.19800000000,R1,2,MUS$2010/PJ,2026 +electricity,all-week,mid-afternoon,all-year,18.50630000000,R1,2,MUS$2010/PJ,2026 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026 -heat,all-week,mid-afternoon,all-year,10.50420000000,R1,2,MUS$2010/PJ,2026 +heat,all-week,mid-afternoon,all-year,10.27560000000,R1,2,MUS$2010/PJ,2026 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026 -electricity,all-week,early-peak,all-year,19.19800000000,R1,3,MUS$2010/PJ,2026 +electricity,all-week,early-peak,all-year,18.50630000000,R1,3,MUS$2010/PJ,2026 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026 -heat,all-week,early-peak,all-year,10.50420000000,R1,3,MUS$2010/PJ,2026 +heat,all-week,early-peak,all-year,10.27560000000,R1,3,MUS$2010/PJ,2026 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026 -electricity,all-week,late-peak,all-year,19.19800000000,R1,4,MUS$2010/PJ,2026 +electricity,all-week,late-peak,all-year,18.50630000000,R1,4,MUS$2010/PJ,2026 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026 -heat,all-week,late-peak,all-year,10.50420000000,R1,4,MUS$2010/PJ,2026 +heat,all-week,late-peak,all-year,10.27560000000,R1,4,MUS$2010/PJ,2026 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026 -electricity,all-week,evening,all-year,19.19800000000,R1,5,MUS$2010/PJ,2026 +electricity,all-week,evening,all-year,18.50630000000,R1,5,MUS$2010/PJ,2026 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026 -heat,all-week,evening,all-year,10.50420000000,R1,5,MUS$2010/PJ,2026 +heat,all-week,evening,all-year,10.27560000000,R1,5,MUS$2010/PJ,2026 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026 -electricity,all-week,early-morning,all-year,19.19800000000,R1,6,MUS$2010/PJ,2026 +electricity,all-week,early-morning,all-year,18.50630000000,R1,6,MUS$2010/PJ,2026 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026 -heat,all-week,early-morning,all-year,10.50420000000,R1,6,MUS$2010/PJ,2026 +heat,all-week,early-morning,all-year,10.27560000000,R1,6,MUS$2010/PJ,2026 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026 -electricity,all-week,late-afternoon,all-year,19.19800000000,R1,7,MUS$2010/PJ,2026 +electricity,all-week,late-afternoon,all-year,18.50630000000,R1,7,MUS$2010/PJ,2026 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026 -heat,all-week,late-afternoon,all-year,10.50420000000,R1,7,MUS$2010/PJ,2026 +heat,all-week,late-afternoon,all-year,10.27560000000,R1,7,MUS$2010/PJ,2026 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026 -electricity,all-week,night,all-year,21.33220000000,R1,0,MUS$2010/PJ,2028 +electricity,all-week,night,all-year,20.12490000000,R1,0,MUS$2010/PJ,2028 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028 -heat,all-week,night,all-year,11.15270000000,R1,0,MUS$2010/PJ,2028 +heat,all-week,night,all-year,10.70840000000,R1,0,MUS$2010/PJ,2028 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028 -electricity,all-week,morning,all-year,21.33220000000,R1,1,MUS$2010/PJ,2028 +electricity,all-week,morning,all-year,20.12490000000,R1,1,MUS$2010/PJ,2028 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028 -heat,all-week,morning,all-year,11.15270000000,R1,1,MUS$2010/PJ,2028 +heat,all-week,morning,all-year,10.70840000000,R1,1,MUS$2010/PJ,2028 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028 -electricity,all-week,mid-afternoon,all-year,21.33220000000,R1,2,MUS$2010/PJ,2028 +electricity,all-week,mid-afternoon,all-year,20.12490000000,R1,2,MUS$2010/PJ,2028 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028 -heat,all-week,mid-afternoon,all-year,11.15270000000,R1,2,MUS$2010/PJ,2028 +heat,all-week,mid-afternoon,all-year,10.70840000000,R1,2,MUS$2010/PJ,2028 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028 -electricity,all-week,early-peak,all-year,21.33220000000,R1,3,MUS$2010/PJ,2028 +electricity,all-week,early-peak,all-year,20.12490000000,R1,3,MUS$2010/PJ,2028 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028 -heat,all-week,early-peak,all-year,11.15270000000,R1,3,MUS$2010/PJ,2028 +heat,all-week,early-peak,all-year,10.70840000000,R1,3,MUS$2010/PJ,2028 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028 -electricity,all-week,late-peak,all-year,21.33220000000,R1,4,MUS$2010/PJ,2028 +electricity,all-week,late-peak,all-year,20.12490000000,R1,4,MUS$2010/PJ,2028 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028 -heat,all-week,late-peak,all-year,11.15270000000,R1,4,MUS$2010/PJ,2028 +heat,all-week,late-peak,all-year,10.70840000000,R1,4,MUS$2010/PJ,2028 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028 -electricity,all-week,evening,all-year,21.33220000000,R1,5,MUS$2010/PJ,2028 +electricity,all-week,evening,all-year,20.12490000000,R1,5,MUS$2010/PJ,2028 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028 -heat,all-week,evening,all-year,11.15270000000,R1,5,MUS$2010/PJ,2028 +heat,all-week,evening,all-year,10.70840000000,R1,5,MUS$2010/PJ,2028 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028 -electricity,all-week,early-morning,all-year,21.33220000000,R1,6,MUS$2010/PJ,2028 +electricity,all-week,early-morning,all-year,20.12490000000,R1,6,MUS$2010/PJ,2028 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028 -heat,all-week,early-morning,all-year,11.15270000000,R1,6,MUS$2010/PJ,2028 +heat,all-week,early-morning,all-year,10.70840000000,R1,6,MUS$2010/PJ,2028 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028 -electricity,all-week,late-afternoon,all-year,21.33220000000,R1,7,MUS$2010/PJ,2028 +electricity,all-week,late-afternoon,all-year,20.12490000000,R1,7,MUS$2010/PJ,2028 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028 -heat,all-week,late-afternoon,all-year,11.15270000000,R1,7,MUS$2010/PJ,2028 +heat,all-week,late-afternoon,all-year,10.70840000000,R1,7,MUS$2010/PJ,2028 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028 -electricity,all-week,night,all-year,21.66670000000,R1,0,MUS$2010/PJ,2030 +electricity,all-week,night,all-year,20.54700000000,R1,0,MUS$2010/PJ,2030 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030 -heat,all-week,night,all-year,11.16590000000,R1,0,MUS$2010/PJ,2030 +heat,all-week,night,all-year,10.71800000000,R1,0,MUS$2010/PJ,2030 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030 -electricity,all-week,morning,all-year,21.66670000000,R1,1,MUS$2010/PJ,2030 +electricity,all-week,morning,all-year,20.54700000000,R1,1,MUS$2010/PJ,2030 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030 -heat,all-week,morning,all-year,11.16590000000,R1,1,MUS$2010/PJ,2030 +heat,all-week,morning,all-year,10.71800000000,R1,1,MUS$2010/PJ,2030 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030 -electricity,all-week,mid-afternoon,all-year,21.66670000000,R1,2,MUS$2010/PJ,2030 +electricity,all-week,mid-afternoon,all-year,20.54700000000,R1,2,MUS$2010/PJ,2030 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030 -heat,all-week,mid-afternoon,all-year,11.16590000000,R1,2,MUS$2010/PJ,2030 +heat,all-week,mid-afternoon,all-year,10.71800000000,R1,2,MUS$2010/PJ,2030 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030 -electricity,all-week,early-peak,all-year,21.66670000000,R1,3,MUS$2010/PJ,2030 +electricity,all-week,early-peak,all-year,20.54700000000,R1,3,MUS$2010/PJ,2030 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030 -heat,all-week,early-peak,all-year,11.16590000000,R1,3,MUS$2010/PJ,2030 +heat,all-week,early-peak,all-year,10.71800000000,R1,3,MUS$2010/PJ,2030 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030 -electricity,all-week,late-peak,all-year,21.66670000000,R1,4,MUS$2010/PJ,2030 +electricity,all-week,late-peak,all-year,20.54700000000,R1,4,MUS$2010/PJ,2030 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030 -heat,all-week,late-peak,all-year,11.16590000000,R1,4,MUS$2010/PJ,2030 +heat,all-week,late-peak,all-year,10.71800000000,R1,4,MUS$2010/PJ,2030 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030 -electricity,all-week,evening,all-year,21.66670000000,R1,5,MUS$2010/PJ,2030 +electricity,all-week,evening,all-year,20.54700000000,R1,5,MUS$2010/PJ,2030 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030 -heat,all-week,evening,all-year,11.16590000000,R1,5,MUS$2010/PJ,2030 +heat,all-week,evening,all-year,10.71800000000,R1,5,MUS$2010/PJ,2030 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030 -electricity,all-week,early-morning,all-year,21.66670000000,R1,6,MUS$2010/PJ,2030 +electricity,all-week,early-morning,all-year,20.54700000000,R1,6,MUS$2010/PJ,2030 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030 -heat,all-week,early-morning,all-year,11.16590000000,R1,6,MUS$2010/PJ,2030 +heat,all-week,early-morning,all-year,10.71800000000,R1,6,MUS$2010/PJ,2030 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030 -electricity,all-week,late-afternoon,all-year,21.66670000000,R1,7,MUS$2010/PJ,2030 +electricity,all-week,late-afternoon,all-year,20.54700000000,R1,7,MUS$2010/PJ,2030 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030 -heat,all-week,late-afternoon,all-year,11.16590000000,R1,7,MUS$2010/PJ,2030 +heat,all-week,late-afternoon,all-year,10.71800000000,R1,7,MUS$2010/PJ,2030 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030 -electricity,all-week,night,all-year,22.77310000000,R1,0,MUS$2010/PJ,2032 +electricity,all-week,night,all-year,21.52420000000,R1,0,MUS$2010/PJ,2032 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032 -heat,all-week,night,all-year,11.59290000000,R1,0,MUS$2010/PJ,2032 +heat,all-week,night,all-year,11.09330000000,R1,0,MUS$2010/PJ,2032 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032 -electricity,all-week,morning,all-year,22.77310000000,R1,1,MUS$2010/PJ,2032 +electricity,all-week,morning,all-year,21.52420000000,R1,1,MUS$2010/PJ,2032 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032 -heat,all-week,morning,all-year,11.59290000000,R1,1,MUS$2010/PJ,2032 +heat,all-week,morning,all-year,11.09330000000,R1,1,MUS$2010/PJ,2032 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032 -electricity,all-week,mid-afternoon,all-year,22.77310000000,R1,2,MUS$2010/PJ,2032 +electricity,all-week,mid-afternoon,all-year,21.52420000000,R1,2,MUS$2010/PJ,2032 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032 -heat,all-week,mid-afternoon,all-year,11.59290000000,R1,2,MUS$2010/PJ,2032 +heat,all-week,mid-afternoon,all-year,11.09330000000,R1,2,MUS$2010/PJ,2032 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032 -electricity,all-week,early-peak,all-year,22.77310000000,R1,3,MUS$2010/PJ,2032 +electricity,all-week,early-peak,all-year,21.52420000000,R1,3,MUS$2010/PJ,2032 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032 -heat,all-week,early-peak,all-year,11.59290000000,R1,3,MUS$2010/PJ,2032 +heat,all-week,early-peak,all-year,11.09330000000,R1,3,MUS$2010/PJ,2032 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032 -electricity,all-week,late-peak,all-year,22.77310000000,R1,4,MUS$2010/PJ,2032 +electricity,all-week,late-peak,all-year,21.52420000000,R1,4,MUS$2010/PJ,2032 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032 -heat,all-week,late-peak,all-year,11.59290000000,R1,4,MUS$2010/PJ,2032 +heat,all-week,late-peak,all-year,11.09330000000,R1,4,MUS$2010/PJ,2032 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032 -electricity,all-week,evening,all-year,22.77310000000,R1,5,MUS$2010/PJ,2032 +electricity,all-week,evening,all-year,21.52420000000,R1,5,MUS$2010/PJ,2032 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032 -heat,all-week,evening,all-year,11.59290000000,R1,5,MUS$2010/PJ,2032 +heat,all-week,evening,all-year,11.09330000000,R1,5,MUS$2010/PJ,2032 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032 -electricity,all-week,early-morning,all-year,22.77310000000,R1,6,MUS$2010/PJ,2032 +electricity,all-week,early-morning,all-year,21.52420000000,R1,6,MUS$2010/PJ,2032 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032 -heat,all-week,early-morning,all-year,11.59290000000,R1,6,MUS$2010/PJ,2032 +heat,all-week,early-morning,all-year,11.09330000000,R1,6,MUS$2010/PJ,2032 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032 -electricity,all-week,late-afternoon,all-year,22.77310000000,R1,7,MUS$2010/PJ,2032 +electricity,all-week,late-afternoon,all-year,21.52420000000,R1,7,MUS$2010/PJ,2032 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032 -heat,all-week,late-afternoon,all-year,11.59290000000,R1,7,MUS$2010/PJ,2032 +heat,all-week,late-afternoon,all-year,11.09330000000,R1,7,MUS$2010/PJ,2032 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032 -electricity,all-week,night,all-year,23.73320000000,R1,0,MUS$2010/PJ,2034 +electricity,all-week,night,all-year,22.24330000000,R1,0,MUS$2010/PJ,2034 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034 -heat,all-week,night,all-year,11.96350000000,R1,0,MUS$2010/PJ,2034 +heat,all-week,night,all-year,11.36750000000,R1,0,MUS$2010/PJ,2034 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034 -electricity,all-week,morning,all-year,23.73320000000,R1,1,MUS$2010/PJ,2034 +electricity,all-week,morning,all-year,22.24330000000,R1,1,MUS$2010/PJ,2034 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034 -heat,all-week,morning,all-year,11.96350000000,R1,1,MUS$2010/PJ,2034 +heat,all-week,morning,all-year,11.36750000000,R1,1,MUS$2010/PJ,2034 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034 -electricity,all-week,mid-afternoon,all-year,23.73320000000,R1,2,MUS$2010/PJ,2034 +electricity,all-week,mid-afternoon,all-year,22.24330000000,R1,2,MUS$2010/PJ,2034 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034 -heat,all-week,mid-afternoon,all-year,11.96350000000,R1,2,MUS$2010/PJ,2034 +heat,all-week,mid-afternoon,all-year,11.36750000000,R1,2,MUS$2010/PJ,2034 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034 -electricity,all-week,early-peak,all-year,23.73320000000,R1,3,MUS$2010/PJ,2034 +electricity,all-week,early-peak,all-year,22.24330000000,R1,3,MUS$2010/PJ,2034 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034 -heat,all-week,early-peak,all-year,11.96350000000,R1,3,MUS$2010/PJ,2034 +heat,all-week,early-peak,all-year,11.36750000000,R1,3,MUS$2010/PJ,2034 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034 -electricity,all-week,late-peak,all-year,23.73320000000,R1,4,MUS$2010/PJ,2034 +electricity,all-week,late-peak,all-year,22.24330000000,R1,4,MUS$2010/PJ,2034 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034 -heat,all-week,late-peak,all-year,11.96350000000,R1,4,MUS$2010/PJ,2034 +heat,all-week,late-peak,all-year,11.36750000000,R1,4,MUS$2010/PJ,2034 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034 -electricity,all-week,evening,all-year,23.73320000000,R1,5,MUS$2010/PJ,2034 +electricity,all-week,evening,all-year,22.24330000000,R1,5,MUS$2010/PJ,2034 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034 -heat,all-week,evening,all-year,11.96350000000,R1,5,MUS$2010/PJ,2034 +heat,all-week,evening,all-year,11.36750000000,R1,5,MUS$2010/PJ,2034 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034 -electricity,all-week,early-morning,all-year,23.73320000000,R1,6,MUS$2010/PJ,2034 +electricity,all-week,early-morning,all-year,22.24330000000,R1,6,MUS$2010/PJ,2034 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034 -heat,all-week,early-morning,all-year,11.96350000000,R1,6,MUS$2010/PJ,2034 +heat,all-week,early-morning,all-year,11.36750000000,R1,6,MUS$2010/PJ,2034 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034 -electricity,all-week,late-afternoon,all-year,23.73320000000,R1,7,MUS$2010/PJ,2034 +electricity,all-week,late-afternoon,all-year,22.24330000000,R1,7,MUS$2010/PJ,2034 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034 -heat,all-week,late-afternoon,all-year,11.96350000000,R1,7,MUS$2010/PJ,2034 +heat,all-week,late-afternoon,all-year,11.36750000000,R1,7,MUS$2010/PJ,2034 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034 -electricity,all-week,night,all-year,24.57440000000,R1,0,MUS$2010/PJ,2036 +electricity,all-week,night,all-year,22.87420000000,R1,0,MUS$2010/PJ,2036 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036 -heat,all-week,night,all-year,12.28820000000,R1,0,MUS$2010/PJ,2036 +heat,all-week,night,all-year,11.60810000000,R1,0,MUS$2010/PJ,2036 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036 -electricity,all-week,morning,all-year,24.57440000000,R1,1,MUS$2010/PJ,2036 +electricity,all-week,morning,all-year,22.87420000000,R1,1,MUS$2010/PJ,2036 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036 -heat,all-week,morning,all-year,12.28820000000,R1,1,MUS$2010/PJ,2036 +heat,all-week,morning,all-year,11.60810000000,R1,1,MUS$2010/PJ,2036 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036 -electricity,all-week,mid-afternoon,all-year,24.57440000000,R1,2,MUS$2010/PJ,2036 +electricity,all-week,mid-afternoon,all-year,22.87420000000,R1,2,MUS$2010/PJ,2036 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036 -heat,all-week,mid-afternoon,all-year,12.28820000000,R1,2,MUS$2010/PJ,2036 +heat,all-week,mid-afternoon,all-year,11.60810000000,R1,2,MUS$2010/PJ,2036 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036 -electricity,all-week,early-peak,all-year,24.57440000000,R1,3,MUS$2010/PJ,2036 +electricity,all-week,early-peak,all-year,22.87420000000,R1,3,MUS$2010/PJ,2036 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036 -heat,all-week,early-peak,all-year,12.28820000000,R1,3,MUS$2010/PJ,2036 +heat,all-week,early-peak,all-year,11.60810000000,R1,3,MUS$2010/PJ,2036 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036 -electricity,all-week,late-peak,all-year,24.57440000000,R1,4,MUS$2010/PJ,2036 +electricity,all-week,late-peak,all-year,22.87420000000,R1,4,MUS$2010/PJ,2036 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036 -heat,all-week,late-peak,all-year,12.28820000000,R1,4,MUS$2010/PJ,2036 +heat,all-week,late-peak,all-year,11.60810000000,R1,4,MUS$2010/PJ,2036 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036 -electricity,all-week,evening,all-year,24.57440000000,R1,5,MUS$2010/PJ,2036 +electricity,all-week,evening,all-year,22.87420000000,R1,5,MUS$2010/PJ,2036 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036 -heat,all-week,evening,all-year,12.28820000000,R1,5,MUS$2010/PJ,2036 +heat,all-week,evening,all-year,11.60810000000,R1,5,MUS$2010/PJ,2036 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036 -electricity,all-week,early-morning,all-year,24.57440000000,R1,6,MUS$2010/PJ,2036 +electricity,all-week,early-morning,all-year,22.87420000000,R1,6,MUS$2010/PJ,2036 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036 -heat,all-week,early-morning,all-year,12.28820000000,R1,6,MUS$2010/PJ,2036 +heat,all-week,early-morning,all-year,11.60810000000,R1,6,MUS$2010/PJ,2036 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036 -electricity,all-week,late-afternoon,all-year,24.57440000000,R1,7,MUS$2010/PJ,2036 +electricity,all-week,late-afternoon,all-year,22.87420000000,R1,7,MUS$2010/PJ,2036 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036 -heat,all-week,late-afternoon,all-year,12.28820000000,R1,7,MUS$2010/PJ,2036 +heat,all-week,late-afternoon,all-year,11.60810000000,R1,7,MUS$2010/PJ,2036 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036 -electricity,all-week,night,all-year,25.31740000000,R1,0,MUS$2010/PJ,2038 +electricity,all-week,night,all-year,23.43220000000,R1,0,MUS$2010/PJ,2038 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038 -heat,all-week,night,all-year,12.57500000000,R1,0,MUS$2010/PJ,2038 +heat,all-week,night,all-year,11.82100000000,R1,0,MUS$2010/PJ,2038 CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038 -electricity,all-week,morning,all-year,25.31740000000,R1,1,MUS$2010/PJ,2038 +electricity,all-week,morning,all-year,23.43220000000,R1,1,MUS$2010/PJ,2038 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038 -heat,all-week,morning,all-year,12.57500000000,R1,1,MUS$2010/PJ,2038 +heat,all-week,morning,all-year,11.82100000000,R1,1,MUS$2010/PJ,2038 CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038 -electricity,all-week,mid-afternoon,all-year,25.31740000000,R1,2,MUS$2010/PJ,2038 +electricity,all-week,mid-afternoon,all-year,23.43220000000,R1,2,MUS$2010/PJ,2038 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038 -heat,all-week,mid-afternoon,all-year,12.57500000000,R1,2,MUS$2010/PJ,2038 +heat,all-week,mid-afternoon,all-year,11.82100000000,R1,2,MUS$2010/PJ,2038 CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038 -electricity,all-week,early-peak,all-year,25.31740000000,R1,3,MUS$2010/PJ,2038 +electricity,all-week,early-peak,all-year,23.43220000000,R1,3,MUS$2010/PJ,2038 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038 -heat,all-week,early-peak,all-year,12.57500000000,R1,3,MUS$2010/PJ,2038 +heat,all-week,early-peak,all-year,11.82100000000,R1,3,MUS$2010/PJ,2038 CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038 -electricity,all-week,late-peak,all-year,25.31740000000,R1,4,MUS$2010/PJ,2038 +electricity,all-week,late-peak,all-year,23.43220000000,R1,4,MUS$2010/PJ,2038 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038 -heat,all-week,late-peak,all-year,12.57500000000,R1,4,MUS$2010/PJ,2038 +heat,all-week,late-peak,all-year,11.82100000000,R1,4,MUS$2010/PJ,2038 CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038 -electricity,all-week,evening,all-year,25.31740000000,R1,5,MUS$2010/PJ,2038 +electricity,all-week,evening,all-year,23.43220000000,R1,5,MUS$2010/PJ,2038 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038 -heat,all-week,evening,all-year,12.57500000000,R1,5,MUS$2010/PJ,2038 +heat,all-week,evening,all-year,11.82100000000,R1,5,MUS$2010/PJ,2038 CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038 -electricity,all-week,early-morning,all-year,25.31740000000,R1,6,MUS$2010/PJ,2038 +electricity,all-week,early-morning,all-year,23.43220000000,R1,6,MUS$2010/PJ,2038 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038 -heat,all-week,early-morning,all-year,12.57500000000,R1,6,MUS$2010/PJ,2038 +heat,all-week,early-morning,all-year,11.82100000000,R1,6,MUS$2010/PJ,2038 CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038 -electricity,all-week,late-afternoon,all-year,25.31740000000,R1,7,MUS$2010/PJ,2038 +electricity,all-week,late-afternoon,all-year,23.43220000000,R1,7,MUS$2010/PJ,2038 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038 -heat,all-week,late-afternoon,all-year,12.57500000000,R1,7,MUS$2010/PJ,2038 +heat,all-week,late-afternoon,all-year,11.82100000000,R1,7,MUS$2010/PJ,2038 CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038 -electricity,all-week,night,all-year,25.95080000000,R1,0,MUS$2010/PJ,2040 +electricity,all-week,night,all-year,23.99230000000,R1,0,MUS$2010/PJ,2040 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040 -heat,all-week,night,all-year,12.86960000000,R1,0,MUS$2010/PJ,2040 +heat,all-week,night,all-year,12.08610000000,R1,0,MUS$2010/PJ,2040 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040 -electricity,all-week,morning,all-year,25.95080000000,R1,1,MUS$2010/PJ,2040 +electricity,all-week,morning,all-year,23.99230000000,R1,1,MUS$2010/PJ,2040 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040 -heat,all-week,morning,all-year,12.86960000000,R1,1,MUS$2010/PJ,2040 +heat,all-week,morning,all-year,12.08610000000,R1,1,MUS$2010/PJ,2040 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040 -electricity,all-week,mid-afternoon,all-year,25.95080000000,R1,2,MUS$2010/PJ,2040 +electricity,all-week,mid-afternoon,all-year,23.99230000000,R1,2,MUS$2010/PJ,2040 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040 -heat,all-week,mid-afternoon,all-year,12.86960000000,R1,2,MUS$2010/PJ,2040 +heat,all-week,mid-afternoon,all-year,12.08610000000,R1,2,MUS$2010/PJ,2040 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040 -electricity,all-week,early-peak,all-year,25.95080000000,R1,3,MUS$2010/PJ,2040 +electricity,all-week,early-peak,all-year,23.99230000000,R1,3,MUS$2010/PJ,2040 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040 -heat,all-week,early-peak,all-year,12.86960000000,R1,3,MUS$2010/PJ,2040 +heat,all-week,early-peak,all-year,12.08610000000,R1,3,MUS$2010/PJ,2040 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040 -electricity,all-week,late-peak,all-year,25.95080000000,R1,4,MUS$2010/PJ,2040 +electricity,all-week,late-peak,all-year,23.99230000000,R1,4,MUS$2010/PJ,2040 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040 -heat,all-week,late-peak,all-year,12.86960000000,R1,4,MUS$2010/PJ,2040 +heat,all-week,late-peak,all-year,12.08610000000,R1,4,MUS$2010/PJ,2040 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040 -electricity,all-week,evening,all-year,25.95080000000,R1,5,MUS$2010/PJ,2040 +electricity,all-week,evening,all-year,23.99230000000,R1,5,MUS$2010/PJ,2040 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040 -heat,all-week,evening,all-year,12.86960000000,R1,5,MUS$2010/PJ,2040 +heat,all-week,evening,all-year,12.08610000000,R1,5,MUS$2010/PJ,2040 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040 -electricity,all-week,early-morning,all-year,25.95080000000,R1,6,MUS$2010/PJ,2040 +electricity,all-week,early-morning,all-year,23.99230000000,R1,6,MUS$2010/PJ,2040 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040 -heat,all-week,early-morning,all-year,12.86960000000,R1,6,MUS$2010/PJ,2040 +heat,all-week,early-morning,all-year,12.08610000000,R1,6,MUS$2010/PJ,2040 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040 -electricity,all-week,late-afternoon,all-year,25.95080000000,R1,7,MUS$2010/PJ,2040 +electricity,all-week,late-afternoon,all-year,23.99230000000,R1,7,MUS$2010/PJ,2040 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040 -heat,all-week,late-afternoon,all-year,12.86960000000,R1,7,MUS$2010/PJ,2040 +heat,all-week,late-afternoon,all-year,12.08610000000,R1,7,MUS$2010/PJ,2040 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040 diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv index a23d8d32e..24109432c 100644 --- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv +++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/technodata/power/Technodata.csv @@ -1,4 +1,4 @@ ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,New -gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 -windturbine,R1,2020,36.30771182,1,0,1,0,1,10,1,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 +gasCCGT,R1,2020,23.78234399,1,0,1,0,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1 +windturbine,R1,2020,36.30771182,1,0,1,0,1,10,0.5,100,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1 From e5447288af12e5eefcd04e8adb1e7fe9a15509ed Mon Sep 17 00:00:00 2001 From: Tom Bland Date: Wed, 18 Dec 2024 14:26:18 +0000 Subject: [PATCH 5/5] Clarify docstrings --- src/muse/costs.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/muse/costs.py b/src/muse/costs.py index b349729b5..25d6cc693 100644 --- a/src/muse/costs.py +++ b/src/muse/costs.py @@ -23,8 +23,9 @@ the parent functions to ensure that these are consistent between inputs to prevent unwanted broadcasting. -The dimensions of the output will be the sum of all dimensions from the input data, -minus "commodity". +Some costs are calculated at the timeslice level (e.g. fuel costs), while others are +calculated for the year/lifetime as a whole (e.g. capital costs, LCOE). Refer to the +individual function docstrings for more details. Some functions have a `method` argument, which can be "annual" or "lifetime": @@ -99,7 +100,7 @@ def capital_costs( def environmental_costs( technologies: xr.Dataset, prices: xr.DataArray, production: xr.DataArray ) -> xr.DataArray: - """Calculate annual environmental costs for the relevant technologies. + """Calculate timeslice-level environmental costs for the relevant technologies. This is the total production of pollutants (commodities flagged by `is_pollutant`) multiplied by their prices. @@ -115,7 +116,7 @@ def environmental_costs( def fuel_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual fuel costs for the relevant technologies. + """Calculate timeslice-level fuel costs for the relevant technologies. This is the total consumption of fuels (commodities flagged by `is_fuel`) multiplied by their prices. @@ -131,7 +132,7 @@ def fuel_costs( def material_costs( technologies: xr.Dataset, prices: xr.DataArray, consumption: xr.DataArray ) -> xr.DataArray: - """Calculate annual material costs for the relevant technologies. + """Calculate timeslice-level material costs for the relevant technologies. This is the total consumption of materials (commodities flagged by `is_material`) multiplied by their prices.