Merge branch 'refs/heads/develop' into RDS/JDJ/update-undetermined-cases

pnnl · Aug 14, 2024 · e1bb11a · e1bb11a
2 parents 2ad8284 + 1189516
commit e1bb11a
Show file tree

Hide file tree

Showing 6 changed files with 1,575 additions and 2,397 deletions.
diff --git a/rct229/rulesets/ashrae9012019/ruleset_functions/g311_exceptions/does_zone_meet_G3_1_1d.py b/rct229/rulesets/ashrae9012019/ruleset_functions/g311_exceptions/does_zone_meet_G3_1_1d.py
@@ -136,9 +136,7 @@ def sum_hvac_total_exhaust_air_func(hvac_id: str) -> Quantity:
                 else:
                     zone_total_exhaust += hvac_system_total_exhaust_airflow
 
-            building_total_lab_exhaust += (
-                building_total_lab_exhaust + zone_total_exhaust
-            )
+            building_total_lab_exhaust += zone_total_exhaust
 
     return (
         zone_id in laboratory_zones_list

diff --git a/rct229/rulesets/ashrae9012019/section18/section18rule3.py b/rct229/rulesets/ashrae9012019/section18/section18rule3.py
@@ -60,7 +60,8 @@ def applicability_check(self, context, calc_vals, data):
 
             return any(
                 [
-                    target_baseline_systems_b[zone_id_b] == SYSTEMORIGIN.G311D
+                    target_baseline_systems_b[zone_id_b]["system_origin"]
+                    == SYSTEMORIGIN.G311D
                     for zone_id_b in target_baseline_systems_b
                 ]
             )