From a8b6ff103688676da53f9498c0e26bac3fca3c90 Mon Sep 17 00:00:00 2001 From: Charlotte Avery <143102500+charlotte-avery@users.noreply.github.com> Date: Fri, 25 Oct 2024 13:46:43 +0100 Subject: [PATCH] Run extra jobs (#146) --- k8s/job.jsonnet | 223 +++--------------------------------------------- 1 file changed, 14 insertions(+), 209 deletions(-) diff --git a/k8s/job.jsonnet b/k8s/job.jsonnet index c763e31..82024e3 100644 --- a/k8s/job.jsonnet +++ b/k8s/job.jsonnet @@ -40,59 +40,11 @@ local job(name, args_excl_output) = { [ // scenarios - job('02-%s-baseline' % std.extVar('SHORT_SHA'), [ - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - ]), - job('03a-%s-bus' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - ]), - job('03b-%s-bus-policy' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - '--price-gbp-per-kwh-gas', - '0.0682', - '--price-gbp-per-kwh-electricity', - '0.182', - ]), - job('03c-%s-bus-policy-high-awareness' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', - '--heat-pump-awareness', - '0.5', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - '--price-gbp-per-kwh-gas', - '0.0682', - '--price-gbp-per-kwh-electricity', - '0.182', - ]), - job('03d-%s-extended-bus' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'extended_boiler_upgrade_scheme', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - ]), - job('03e-%s-extended-bus-policy' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'extended_boiler_upgrade_scheme', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - '--price-gbp-per-kwh-gas', - '0.0682', - '--price-gbp-per-kwh-electricity', - '0.182', - ]), - job('03f-%s-extended-bus-policy-high-awareness' % std.extVar('SHORT_SHA'), [ + job('03g-%s-extended-bus-policy-very-high-awareness' % std.extVar('SHORT_SHA'), [ '--intervention', 'extended_boiler_upgrade_scheme', '--heat-pump-awareness', - '0.5', + '0.7', '--air-source-heat-pump-price-discount-date', '2026-01-01:0.3', '--price-gbp-per-kwh-gas', @@ -100,34 +52,21 @@ local job(name, args_excl_output) = { '--price-gbp-per-kwh-electricity', '0.182', ]), - job('04a-%s-max-policy' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', + job('03h-%s-extended-bus-policy-extremely-awareness' % std.extVar('SHORT_SHA'), [ '--intervention', - 'gas_oil_boiler_ban', - '--gas-oil-boiler-ban-date', - '2035-01-01', - '--gas-oil-boiler-ban-announce-date', - '2025-01-01', + 'extended_boiler_upgrade_scheme', '--heat-pump-awareness', - '0.5', + '0.9', '--air-source-heat-pump-price-discount-date', '2026-01-01:0.3', '--price-gbp-per-kwh-gas', '0.0682', '--price-gbp-per-kwh-electricity', '0.182', - '--include-new-builds', ]), - job('04b-%s-max-policy-unlimited-installers' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', + job('03i-%s-extended-bus-policy-high-awareness-unlimited-installers' % std.extVar('SHORT_SHA'), [ '--intervention', - 'gas_oil_boiler_ban', - '--gas-oil-boiler-ban-date', - '2035-01-01', - '--gas-oil-boiler-ban-announce-date', - '2025-01-01', + 'extended_boiler_upgrade_scheme', '--heat-pump-awareness', '0.5', '--air-source-heat-pump-price-discount-date', @@ -137,17 +76,11 @@ local job(name, args_excl_output) = { '--price-gbp-per-kwh-electricity', '0.182', '--heat-pump-installer-count', - '10000000000' + '10000000000', ]), - job('04c-%s-max-policy-delayed-announcement' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', + job('03j-%s-extended-bus-policy-high-awareness-unlimited-installers-new-builds' % std.extVar('SHORT_SHA'), [ '--intervention', - 'gas_oil_boiler_ban', - '--gas-oil-boiler-ban-date', - '2035-01-01', - '--gas-oil-boiler-ban-announce-date', - '2030-01-01', + 'extended_boiler_upgrade_scheme', '--heat-pump-awareness', '0.5', '--air-source-heat-pump-price-discount-date', @@ -156,154 +89,26 @@ local job(name, args_excl_output) = { '0.0682', '--price-gbp-per-kwh-electricity', '0.182', - '--include-new-builds' - ]), - job('05-%s-max-industry' % std.extVar('SHORT_SHA'), [ - '--heat-pump-awareness', - '0.5', - '--heating-system-hassle-factor', - '0', - '--rented-heating-system-hassle-factor', - '0', - '--all-agents-heat-pump-suitable', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - '--air-source-heat-pump-price-discount-date', - '2028-01-01:0.6', + '--heat-pump-installer-count', + '10000000000', + '--include-new-builds', ]), - job('06a-%s-max-policy-max-industry' % std.extVar('SHORT_SHA'), [ + job('04d-%s-max-policy-wo-new-builds' % std.extVar('SHORT_SHA'), [ '--intervention', 'boiler_upgrade_scheme', '--intervention', 'gas_oil_boiler_ban', - '--gas-oil-boiler-ban-announce-date', - '2025-01-01', '--gas-oil-boiler-ban-date', '2035-01-01', - '--heat-pump-awareness', - '0.5', - '--heating-system-hassle-factor', - '0', - '--rented-heating-system-hassle-factor', - '0', - '--all-agents-heat-pump-suitable', - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.3', - '--air-source-heat-pump-price-discount-date', - '2028-01-01:0.6', - '--price-gbp-per-kwh-gas', - '0.0682', - '--price-gbp-per-kwh-electricity', - '0.182', - '--include-new-builds' - ]), - job('06b-%s-max-policy-max-industry-unlimited-installers' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', - '--intervention', - 'gas_oil_boiler_ban', '--gas-oil-boiler-ban-announce-date', '2025-01-01', - '--gas-oil-boiler-ban-date', - '2035-01-01', '--heat-pump-awareness', '0.5', - '--heating-system-hassle-factor', - '0', - '--rented-heating-system-hassle-factor', - '0', - '--all-agents-heat-pump-suitable', '--air-source-heat-pump-price-discount-date', '2026-01-01:0.3', - '--air-source-heat-pump-price-discount-date', - '2028-01-01:0.6', '--price-gbp-per-kwh-gas', '0.0682', '--price-gbp-per-kwh-electricity', '0.182', - '--heat-pump-installer-count', - '10000000000' - ]), - - // sensitivity tests - - job('50-%s-pump-awareness-low' % std.extVar('SHORT_SHA'), [ - '--heat-pump-awareness', - '0.2', - ]), - job('51-%s-pump-awareness-high' % std.extVar('SHORT_SHA'), [ - '--heat-pump-awareness', - '1.0', - ]), - - job('52-%s-annual-reno-rate-low' % std.extVar('SHORT_SHA'), [ - '--annual-renovation-rate', - '0.05', - ]), - job('53-%s-annual-reno-rate-high' % std.extVar('SHORT_SHA'), [ - '--annual-renovation-rate', - '0.33', - ]), - - job('54-%s-household-lookahead-low' % std.extVar('SHORT_SHA'), [ - '--household-num-lookahead-years', - '1', - ]), - job('55-%s-household-lookahead-high' % std.extVar('SHORT_SHA'), [ - '--household-num-lookahead-years', - '5', - ]), - - job('56-%s-heating-system-hassle-low' % std.extVar('SHORT_SHA'), [ - '--heating-system-hassle-factor', - '0', - '--rented-heating-system-hassle-factor', - '0.2', - ]), - job('57-%s-heating-system-hassle-high' % std.extVar('SHORT_SHA'), [ - '--heating-system-hassle-factor', - '0.2', - '--rented-heating-system-hassle-factor', - '0.6', - ]), - - job('58-%s-heat-pump-suitable-low' % std.extVar('SHORT_SHA'), []), - job('59-%s-heat-pump-suitable-high' % std.extVar('SHORT_SHA'), [ - '--all-agents-heat-pump-suitable', - ]), - - job('59-%s-fuel-price-low' % std.extVar('SHORT_SHA'), [ - '--price-gbp-per-kwh-gas', - '0.02325', - '--price-gbp-per-kwh-electricity', - '0.1003', - '--price-gbp-per-kwh-oil', - '0.0241', - ]), - job('60-%s-fuel-price-high' % std.extVar('SHORT_SHA'), [ - '--price-gbp-per-kwh-gas', - '0.06975', - '--price-gbp-per-kwh-electricity', - '0.3009', - '--price-gbp-per-kwh-oil', - '0.0723', - ]), - - job('61-%s-ashp-discount-low' % std.extVar('SHORT_SHA'), [ - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0', - ]), - job('62-%s-ashp-discount-high' % std.extVar('SHORT_SHA'), [ - '--air-source-heat-pump-price-discount-date', - '2026-01-01:0.6', - ]), - - job('63-%s-hp-installer-growth-low' % std.extVar('SHORT_SHA'), [ - '--heat-pump-installer-annual-growth-rate', - '0', - ]), - job('64-%s-hp-installer-growth-high' % std.extVar('SHORT_SHA'), [ - '--heat-pump-installer-annual-growth-rate', - '1', ]), ]