@@ -67,7 +67,7 @@ def initialize(base_xml, ns)
6767 @space_types_floor_area = nil
6868 @conditioned_floor_area_heated_only = nil
6969 @conditioned_floor_area_cooled_only = nil
70- @conditioned_floor_area_heated_cooled = nil
70+ @conditioned_floor_area_heated_cooled = 0
7171 @custom_conditioned_above_grade_floor_area = nil
7272 @custom_conditioned_below_grade_floor_area = nil
7373
@@ -85,12 +85,10 @@ def read_floor_areas(parent_total_floor_area)
8585 floor_area_type = floor_area_element . elements [ "#{ @ns } :FloorAreaType" ] . text
8686 if floor_area_type == 'Gross'
8787 @total_floor_area = OpenStudio . convert ( validate_positive_number_excluding_zero ( 'gross_floor_area' , floor_area ) , 'ft^2' , 'm^2' ) . get
88- elsif floor_area_type == 'Heated and Cooled'
89- @conditioned_floor_area_heated_cooled = OpenStudio . convert ( validate_positive_number_excluding_zero ( '@heated_and_cooled_floor_area' , floor_area ) , 'ft^2' , 'm^2' ) . get
9088 elsif floor_area_type == 'Footprint'
9189 @footprint_floor_area = OpenStudio . convert ( validate_positive_number_excluding_zero ( '@footprint_floor_area' , floor_area ) , 'ft^2' , 'm^2' ) . get
92- elsif floor_area_type == 'Conditioned'
93- @conditioned_floor_area_heated_cooled = OpenStudio . convert ( validate_positive_number_excluding_zero ( '@conditioned_floor_area_heated_cooled' , floor_area ) , 'ft^2' , 'm^2' ) . get
90+ elsif floor_area_type == 'Conditioned' || floor_area_type == 'Common' || floor_area_type == 'Heated and Cooled'
91+ @conditioned_floor_area_heated_cooled + = OpenStudio . convert ( validate_positive_number_excluding_zero ( '@conditioned_floor_area_heated_cooled' , floor_area ) , 'ft^2' , 'm^2' ) . get
9492 elsif floor_area_type == 'Heated Only'
9593 @conditioned_floor_area_heated_only = OpenStudio . convert ( validate_positive_number_excluding_zero ( '@heated_only_floor_area' , floor_area ) , 'ft^2' , 'm^2' ) . get
9694 elsif floor_area_type == 'Cooled Only'
0 commit comments