diff --git a/k8s/job.jsonnet b/k8s/job.jsonnet index 1d5214d..4ee9a67 100644 --- a/k8s/job.jsonnet +++ b/k8s/job.jsonnet @@ -40,80 +40,15 @@ local job(name, args_excl_output) = { [ // scenarios - job('03g-%s-extended-bus-policy-very-high-awareness' % std.extVar('SHORT_SHA'), [ + job('01a-%s-max-policy-extended-bus' % std.extVar('SHORT_SHA'), [ '--intervention', 'extended_boiler_upgrade_scheme', - '--heat-pump-awareness', - '0.7', - '--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('03h-%s-extended-bus-policy-extremely-awareness' % std.extVar('SHORT_SHA'), [ '--intervention', - 'extended_boiler_upgrade_scheme', - '--heat-pump-awareness', - '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', - ]), - job('03i-%s-ext-bus-policy-high-awareness-unlimited-installers' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'extended_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', - '--heat-pump-installer-count', - '10000000000', - ]), - job('03j-%s-ext-bus-high-awareness-unltd-installers-new-builds' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'extended_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', - '--heat-pump-installer-count', - '10000000000', - '--include-new-builds', - ]), - 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-date', - '2035-01-01', - '--gas-oil-boiler-ban-announce-date', - '2025-01-01', - '--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('04e-%s-max-policy-all-suitable' % std.extVar('SHORT_SHA'), [ - '--intervention', - 'boiler_upgrade_scheme', + 'heat_pump_campaign', + '--campaign-target-heat-pump-awareness', + '0.8', + '--heat-pump-awareness-campaign-date', + '2028-01-01', '--intervention', 'gas_oil_boiler_ban', '--gas-oil-boiler-ban-date', @@ -122,12 +57,11 @@ local job(name, args_excl_output) = { '2025-01-01', '--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', - '--all-agents-heat-pump-suitable', + '--heat-pump-installer-count', + '10000000000' ]), ]