mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-06-08 11:17:27 +00:00
3581513b7e
The §5 (70) internal-gains mirror of S0380.201's Table 4f (230c). SAP 10.2 Table 5a note a) (PDF p.177) verbatim: "Where there are two main heating systems serving different parts of the dwelling, assume each has its own circulation pump and therefore include two figures from this table. ... Where two main systems serve the same space a single pump is assumed." Simulated case 6 (dual oil, 51% radiators + 49% underfloor) lodges Main 1 "2013 or later" (3 W) + Main 2 unknown date (7 W) → worksheet (70) = 10 W in the 8 heating months. The cascade billed a single Main 1 pump (3 W). New `_second_main_central_heating_pump_gain_w` adds the second main's gain (at its own pump-age bucket), gated on a lodged main_heating_fraction > 0 — the same genuine-second-space-heating-main test as S0380.201, so DHW-only second mains (cert 000565 Main 2 combi via WHC 914, fraction 0) keep a single pump (70)=3. Refactored the per-detail pump predicate (`_main_detail_has_central_heating_pump`) and date bucket (`_pump_date_category_for_detail`) out of the orchestrator. Re-pin: golden 0240 (dual-main oil combi, both unknown date) (70) 7 → 14 W; the extra internal gain lowers space-heating demand → SAP cont 72.18 → 72.24 (integer 72 unchanged), PE +2.8092 → +2.5812, CO2 +0.1385 → +0.1269 (both closer to zero). Validated against the case-6 worksheet. This closes the (70) leg of case 6's space-demand gap. Remaining for full case-6 closure: roof fabric (37) +1.176 W/K (room-in-roof shell) and HW (216) Eq-D1 water efficiency −1.6%. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| addresses | ||
| fuel_rates | ||
| property | ||
| property_baseline | ||
| sap10_calculator | ||
| tasks | ||
| __init__.py | ||
| test_postcode.py | ||