diff --git a/rct229/rulesets/ashrae9012019/section19/section19rule3.py b/rct229/rulesets/ashrae9012019/section19/section19rule3.py index a97d47681..941a6bce7 100644 --- a/rct229/rulesets/ashrae9012019/section19/section19rule3.py +++ b/rct229/rulesets/ashrae9012019/section19/section19rule3.py @@ -30,7 +30,7 @@ def get_calc_vals(self, context, data=None): weather_b = rpd_b["weather"] return { "cooling_design_day_type": weather_b.get("cooling_design_day_type"), - "heating_design_day_type": weather_b.get("heating_design_day_type") + "heating_design_day_type": weather_b.get("heating_design_day_type"), } def applicability_check(self, context, calc_vals, data): @@ -39,8 +39,7 @@ def applicability_check(self, context, calc_vals, data): return ( cooling_design_day_type == COOLING_DESIGN_DAY.COOLING_1_0 - and heating_design_day_type - == HEATING_DESIGN_DAY.HEATING_99_6 + and heating_design_day_type == HEATING_DESIGN_DAY.HEATING_99_6 ) def get_manual_check_required_msg(self, context, calc_vals=None, data=None): diff --git a/rct229/rulesets/ashrae9012019/section5/section5rule38.py b/rct229/rulesets/ashrae9012019/section5/section5rule38.py index c6ce9ede1..54e17ef42 100644 --- a/rct229/rulesets/ashrae9012019/section5/section5rule38.py +++ b/rct229/rulesets/ashrae9012019/section5/section5rule38.py @@ -34,7 +34,8 @@ def is_applicable(self, context, data=None): rpd = context.BASELINE_0 return any( [ - get_opaque_surface_type(surface_b) == OST.BELOW_GRADE_WALL + get_opaque_surface_type(surface_b) + in [OST.BELOW_GRADE_WALL, OST.UNHEATED_SOG, OST.HEATED_SOG] for surface_b in find_all( "$.ruleset_model_descriptions[0].buildings[*].building_segments[*].zones[" "*].surfaces[*]", @@ -53,5 +54,7 @@ def applicability_check(self, context, calc_vals, data): return ground_temperature_schedule def get_manual_check_required_msg(self, context, calc_vals=None, data=None): - ground_temperature_schedule = calc_vals["ground_temperature_schedule"] - return UNDETERMINED_MSG if ground_temperature_schedule else NOT_APPLICABLE_MSG + return UNDETERMINED_MSG + + def get_not_applicable_msg(self, context, data=None): + return NOT_APPLICABLE_MSG