From 3cf0b8ec9ad862871f37e4b42fb750d9e68bb58a Mon Sep 17 00:00:00 2001 From: Jackson Jarboe <122476654+JacksonJ-KC@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:38:25 -0500 Subject: [PATCH] update outcome when power per storage volume exceeds limit --- rct229/rulesets/ashrae9012019/section11/section11rule10.py | 2 +- .../ruletest_jsons/ashrae9012019/section11/rule_11_10.json | 4 ++-- rct229/utils/pint_utils.py | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rct229/rulesets/ashrae9012019/section11/section11rule10.py b/rct229/rulesets/ashrae9012019/section11/section11rule10.py index 77793f96e2..bb53828a14 100644 --- a/rct229/rulesets/ashrae9012019/section11/section11rule10.py +++ b/rct229/rulesets/ashrae9012019/section11/section11rule10.py @@ -264,7 +264,7 @@ def get_calc_vals(self, context, data=None): "swh_tank_type_b": swh_tank_type_b, "swh_input_power_b": swh_input_power_b, "swh_tank_storage_volume_b": CalcQ( - "volume", swh_tank_storage_volume_b + "tank_volume", swh_tank_storage_volume_b ), "modeled_efficiency_b": modeled_efficiency_b, "modeled_standby_loss_b": modeled_standby_loss_b, diff --git a/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section11/rule_11_10.json b/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section11/rule_11_10.json index 2d6c722a07..731d4d3339 100644 --- a/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section11/rule_11_10.json +++ b/rct229/ruletest_engine/ruletest_jsons/ashrae9012019/section11/rule_11_10.json @@ -491,7 +491,7 @@ "Rule": 10, "Test": "h", "test_description": "A one story, one zone building has one gas storage water heater with input rating >105kBtu/h, 50 gallons storage capacity. The water heater efficiency is correctly modeled as 80% Et but the 1,500 Btu/h standby loss exceeds the limit.", - "expected_rule_outcome": "fail", + "expected_rule_outcome": "undetermined", "expected_raised_message_includes": "The modeled efficiency or standby loss for the water heater does not match the expected values.", "standard": { "rule_id": "11-10", @@ -538,7 +538,7 @@ "id": "SHW Equipment 1", "distribution_system": "SHW Distribution 1", "heater_fuel_type": "NATURAL_GAS", - "input_power": 35168.53333333333, + "input_power": 73267.77777777778, "efficiency_metric_types": [ "THERMAL_EFFICIENCY", "STANDBY_LOSS_ENERGY" diff --git a/rct229/utils/pint_utils.py b/rct229/utils/pint_utils.py index fa47032d84..bcd23b677a 100644 --- a/rct229/utils/pint_utils.py +++ b/rct229/utils/pint_utils.py @@ -47,6 +47,7 @@ class UNIT_SYSTEM: "transformer_capacity": "V*A", "electric_power": "W", "volume": "m3", + "tank_volume": "L", "area": "m2", "power_density": "W/m2", "thermal_transmittance": "W/(m2*K)", @@ -67,6 +68,7 @@ class UNIT_SYSTEM: "transformer_capacity": "V*A", "electric_power": "W", "volume": "ft3", + "tank_volume": "gallon", "area": "ft2", "power_density": "W/ft2", "thermal_transmittance": "Btu/(hr*ft2*R)",