urbanopt-cli 0.10.0 → 0.11.0

data/example_files/resources/hpxml-measures/BuildResidentialHPXML/resources/geometry.rb

@@ -1,3 +1,8 @@
+# *********************************************************************************
+# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# See also https://github.com/urbanopt/urbanopt-cli/blob/develop/LICENSE.md
+# *********************************************************************************
+
 # frozen_string_literal: true
 
 class Geometry
@@ -80,7 +85,7 @@ class Geometry
       next if surface == adjacent_surface
       next if adjacent_surface.surfaceType != adjacentSurfaceType
       next if adjacent_surface.outsideBoundaryCondition != 'Adiabatic'
-      next unless Geometry.has_same_vertices(surface, adjacent_surface)
+      next unless has_same_vertices(surface, adjacent_surface)
 
       return adjacent_surface
     end
@@ -289,9 +294,9 @@ class Geometry
       return false
     end
 
-    # create living zone
-    living_zone = OpenStudio::Model::ThermalZone.new(model)
-    living_zone.setName(HPXML::LocationLivingSpace)
+    # create conditioned zone
+    conditioned_zone = OpenStudio::Model::ThermalZone.new(model)
+    conditioned_zone.setName(HPXML::LocationConditionedSpace)
 
     # loop through the number of floors
     foundation_polygon_with_wrong_zs = nil
@@ -343,11 +348,11 @@ class Geometry
           se_point = OpenStudio::Point3d.new(length, 0, z)
           l_se_point = OpenStudio::Point3d.new(length - garage_width, 0, z)
           if ((garage_depth < width) || (garage_protrusion > 0)) && (garage_protrusion < 1) # garage protrudes but not fully
-            living_polygon = make_polygon(sw_point, nw_point, ne_point, garage_ne_point, garage_nw_point, l_se_point)
-          elsif garage_protrusion < 1 # garage fits perfectly within living space
-            living_polygon = make_polygon(sw_point, nw_point, garage_nw_point, garage_sw_point)
+            conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, garage_ne_point, garage_nw_point, l_se_point)
+          elsif garage_protrusion < 1 # garage fits perfectly within conditioned space
+            conditioned_polygon = make_polygon(sw_point, nw_point, garage_nw_point, garage_sw_point)
           else # garage fully protrudes
-            living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+            conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
           end
         elsif garage_position == 'Left'
           sw_point = OpenStudio::Point3d.new(0, 0, z)
@@ -356,14 +361,14 @@ class Geometry
           se_point = OpenStudio::Point3d.new(length, 0, z)
           l_sw_point = OpenStudio::Point3d.new(garage_width, 0, z)
           if ((garage_depth < width) || (garage_protrusion > 0)) && (garage_protrusion < 1) # garage protrudes but not fully
-            living_polygon = make_polygon(garage_nw_point, nw_point, ne_point, se_point, l_sw_point, garage_ne_point)
-          elsif garage_protrusion < 1 # garage fits perfectly within living space
-            living_polygon = make_polygon(garage_se_point, garage_ne_point, ne_point, se_point)
+            conditioned_polygon = make_polygon(garage_nw_point, nw_point, ne_point, se_point, l_sw_point, garage_ne_point)
+          elsif garage_protrusion < 1 # garage fits perfectly within conditioned space
+            conditioned_polygon = make_polygon(garage_se_point, garage_ne_point, ne_point, se_point)
           else # garage fully protrudes
-            living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+            conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
           end
         end
-        foundation_polygon_with_wrong_zs = living_polygon
+        foundation_polygon_with_wrong_zs = conditioned_polygon
       else # first floor without garage or above first floor
 
         if has_garage
@@ -378,9 +383,9 @@ class Geometry
             se_point = OpenStudio::Point3d.new(length, 0, z)
             l_se_point = OpenStudio::Point3d.new(length - garage_width, 0, z)
             if garage_protrusion > 0 # garage protrudes
-              living_polygon = make_polygon(sw_point, nw_point, ne_point, garage_se_point, garage_sw_point, l_se_point)
+              conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, garage_se_point, garage_sw_point, l_se_point)
             else # garage does not protrude
-              living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+              conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
             end
           elsif garage_position == 'Left'
             sw_point = OpenStudio::Point3d.new(0, 0, z)
@@ -389,9 +394,9 @@ class Geometry
             se_point = OpenStudio::Point3d.new(length, 0, z)
             l_sw_point = OpenStudio::Point3d.new(garage_width, 0, z)
             if garage_protrusion > 0 # garage protrudes
-              living_polygon = make_polygon(garage_sw_point, nw_point, ne_point, se_point, l_sw_point, garage_se_point)
+              conditioned_polygon = make_polygon(garage_sw_point, nw_point, ne_point, se_point, l_sw_point, garage_se_point)
             else # garage does not protrude
-              living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+              conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
             end
           end
 
@@ -401,9 +406,9 @@ class Geometry
           nw_point = OpenStudio::Point3d.new(0, width, z)
           ne_point = OpenStudio::Point3d.new(length, width, z)
           se_point = OpenStudio::Point3d.new(length, 0, z)
-          living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+          conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
           if z == rim_joist_height
-            foundation_polygon_with_wrong_zs = living_polygon
+            foundation_polygon_with_wrong_zs = conditioned_polygon
           end
 
         end
@@ -411,26 +416,26 @@ class Geometry
       end
 
       # make space
-      living_space = OpenStudio::Model::Space::fromFloorPrint(living_polygon, average_ceiling_height, model)
-      living_space = living_space.get
-      assign_indexes(model, living_polygon, living_space)
+      conditioned_space = OpenStudio::Model::Space::fromFloorPrint(conditioned_polygon, average_ceiling_height, model)
+      conditioned_space = conditioned_space.get
+      assign_indexes(model, conditioned_polygon, conditioned_space)
 
       if floor > 0
-        living_space_name = "#{HPXML::LocationLivingSpace}|story #{floor + 1}"
+        conditioned_space_name = "#{HPXML::LocationConditionedSpace}|story #{floor + 1}"
       else
-        living_space_name = HPXML::LocationLivingSpace
+        conditioned_space_name = HPXML::LocationConditionedSpace
       end
-      living_space.setName(living_space_name)
-      living_space_type = OpenStudio::Model::SpaceType.new(model)
-      living_space_type.setStandardsSpaceType(HPXML::LocationLivingSpace)
-      living_space.setSpaceType(living_space_type)
+      conditioned_space.setName(conditioned_space_name)
+      conditioned_space_type = OpenStudio::Model::SpaceType.new(model)
+      conditioned_space_type.setStandardsSpaceType(HPXML::LocationConditionedSpace)
+      conditioned_space.setSpaceType(conditioned_space_type)
 
-      # set these to the living zone
-      living_space.setThermalZone(living_zone)
+      # set these to the conditioned zone
+      conditioned_space.setThermalZone(conditioned_zone)
 
       m = initialize_transformation_matrix(OpenStudio::Matrix.new(4, 4, 0))
       m[2, 3] = z
-      living_space.changeTransformation(OpenStudio::Transformation.new(m))
+      conditioned_space.changeTransformation(OpenStudio::Transformation.new(m))
     end
 
     # Attic
@@ -527,8 +532,8 @@ class Geometry
         end
         attic_zone.setName(attic_space_name)
       elsif attic_type == HPXML::AtticTypeConditioned
-        attic_space.setThermalZone(living_zone)
-        attic_space_name = HPXML::LocationLivingSpace
+        attic_space.setThermalZone(conditioned_zone)
+        attic_space_name = HPXML::LocationConditionedSpace
       end
       attic_space.setName(attic_space_name)
       attic_space_type = OpenStudio::Model::SpaceType.new(model)
@@ -547,7 +552,7 @@ class Geometry
         HPXML::FoundationTypeCrawlspaceConditioned,
         HPXML::FoundationTypeBasementUnconditioned,
         HPXML::FoundationTypeBasementConditioned,
-        HPXML::FoundationTypeAmbient].include? foundation_type
+        HPXML::FoundationTypeAmbient].include?(foundation_type) || foundation_type.start_with?(HPXML::FoundationTypeBellyAndWing)
 
       z = -foundation_height
 
@@ -577,6 +582,8 @@ class Geometry
         foundation_space_name = HPXML::LocationBasementConditioned
       elsif foundation_type == HPXML::FoundationTypeAmbient
         foundation_space_name = HPXML::LocationOutside
+      elsif foundation_type.start_with?(HPXML::FoundationTypeBellyAndWing)
+        foundation_space_name = HPXML::LocationManufacturedHomeUnderBelly
       end
       foundation_zone.setName(foundation_space_name)
       foundation_space.setName(foundation_space_name)
@@ -620,7 +627,7 @@ class Geometry
 
     if has_garage && attic_type != HPXML::AtticTypeFlatRoof
       if num_floors > 1
-        space_with_roof_over_garage = living_space
+        space_with_roof_over_garage = conditioned_space
       else
         space_with_roof_over_garage = garage_space
       end
@@ -652,10 +659,10 @@ class Geometry
         end
 
         if num_floors == 1
-          nw_point = OpenStudio::Point3d.new(nw_point.x, nw_point.y, living_space.zOrigin + nw_point.z)
-          ne_point = OpenStudio::Point3d.new(ne_point.x, ne_point.y, living_space.zOrigin + ne_point.z)
-          sw_point = OpenStudio::Point3d.new(sw_point.x, sw_point.y, living_space.zOrigin + sw_point.z)
-          se_point = OpenStudio::Point3d.new(se_point.x, se_point.y, living_space.zOrigin + se_point.z)
+          nw_point = OpenStudio::Point3d.new(nw_point.x, nw_point.y, conditioned_space.zOrigin + nw_point.z)
+          ne_point = OpenStudio::Point3d.new(ne_point.x, ne_point.y, conditioned_space.zOrigin + ne_point.z)
+          sw_point = OpenStudio::Point3d.new(sw_point.x, sw_point.y, conditioned_space.zOrigin + sw_point.z)
+          se_point = OpenStudio::Point3d.new(se_point.x, se_point.y, conditioned_space.zOrigin + se_point.z)
         else
           nw_point = OpenStudio::Point3d.new(nw_point.x, nw_point.y, num_floors * nw_point.z + rim_joist_height)
           ne_point = OpenStudio::Point3d.new(ne_point.x, ne_point.y, num_floors * ne_point.z + rim_joist_height)
@@ -673,8 +680,8 @@ class Geometry
 
         if num_floors == 1
           if not attic_type == HPXML::AtticTypeConditioned
-            roof_n_point = OpenStudio::Point3d.new((nw_point.x + ne_point.x) / 2, nw_point.y + garage_attic_height / roof_pitch, living_space.zOrigin + average_ceiling_height + garage_attic_height)
-            roof_s_point = OpenStudio::Point3d.new((sw_point.x + se_point.x) / 2, sw_point.y, living_space.zOrigin + average_ceiling_height + garage_attic_height)
+            roof_n_point = OpenStudio::Point3d.new((nw_point.x + ne_point.x) / 2, nw_point.y + garage_attic_height / roof_pitch, conditioned_space.zOrigin + average_ceiling_height + garage_attic_height)
+            roof_s_point = OpenStudio::Point3d.new((sw_point.x + se_point.x) / 2, sw_point.y, conditioned_space.zOrigin + average_ceiling_height + garage_attic_height)
           else
             roof_n_point = OpenStudio::Point3d.new((nw_point.x + ne_point.x) / 2, nw_point.y + garage_attic_height / roof_pitch, garage_attic_height + average_ceiling_height)
             roof_s_point = OpenStudio::Point3d.new((sw_point.x + se_point.x) / 2, sw_point.y, garage_attic_height + average_ceiling_height)
@@ -709,7 +716,7 @@ class Geometry
 
         if attic_type == HPXML::AtticTypeConditioned
           garage_attic_space_name = attic_space_name
-          garage_attic_space.setThermalZone(living_zone)
+          garage_attic_space.setThermalZone(conditioned_zone)
         else
           if num_floors > 1
             garage_attic_space_name = attic_space_name
@@ -832,9 +839,9 @@ class Geometry
   end
 
   def self.has_same_vertices(surface1, surface2)
-    if getSurfaceXValues([surface1]).sort == getSurfaceXValues([surface2]).sort &&
-       getSurfaceYValues([surface1]).sort == getSurfaceYValues([surface2]).sort &&
-       getSurfaceZValues([surface1]).sort == getSurfaceZValues([surface2]).sort &&
+    if get_surface_x_values([surface1]).sort == get_surface_x_values([surface2]).sort &&
+       get_surface_y_values([surface1]).sort == get_surface_y_values([surface2]).sort &&
+       get_surface_z_values([surface1]).sort == get_surface_z_values([surface2]).sort &&
        surface1.space.get.zOrigin.round(5) == surface2.space.get.zOrigin.round(5)
       return true
     end
@@ -862,7 +869,7 @@ class Geometry
     space.surfaces.each do |surface|
       next unless surface.surfaceType.downcase == 'floor'
 
-      return getSurfaceZValues([surface])[0]
+      return get_surface_z_values([surface])[0]
     end
   end
 
@@ -1364,13 +1371,13 @@ class Geometry
       multy = 1
     end
     if (facade == Constants.FacadeBack) || (facade == Constants.FacadeLeft)
-      leftx = getSurfaceXValues([surface]).max
-      lefty = getSurfaceYValues([surface]).max
+      leftx = get_surface_x_values([surface]).max
+      lefty = get_surface_y_values([surface]).max
     else
-      leftx = getSurfaceXValues([surface]).min
-      lefty = getSurfaceYValues([surface]).min
+      leftx = get_surface_x_values([surface]).min
+      lefty = get_surface_y_values([surface]).min
     end
-    bottomz = getSurfaceZValues([surface]).min
+    bottomz = get_surface_z_values([surface]).min
     [upperleft, lowerleft, lowerright, upperright].each do |coord|
       newx = UnitConversions.convert(leftx + multx * coord[0], 'ft', 'm')
       newy = UnitConversions.convert(lefty + multy * coord[0], 'ft', 'm')
@@ -1387,7 +1394,7 @@ class Geometry
   def self.get_conditioned_spaces(spaces)
     conditioned_spaces = []
     spaces.each do |space|
-      next unless space.spaceType.get.standardsSpaceType.get == HPXML::LocationLivingSpace
+      next unless space.spaceType.get.standardsSpaceType.get == HPXML::LocationConditionedSpace
 
       conditioned_spaces << space
     end
@@ -1412,9 +1419,9 @@ class Geometry
       return false
     end
 
-    xvalues = getSurfaceXValues([surface])
-    yvalues = getSurfaceYValues([surface])
-    zvalues = getSurfaceZValues([surface])
+    xvalues = get_surface_x_values([surface])
+    yvalues = get_surface_y_values([surface])
+    zvalues = get_surface_z_values([surface])
     if not (((xvalues.uniq.size == 1) && (yvalues.uniq.size == 2)) ||
             ((xvalues.uniq.size == 2) && (yvalues.uniq.size == 1)))
       return false
@@ -1483,7 +1490,7 @@ class Geometry
     min_story_avail_walls = []
     min_story_avail_wall_minz = 99999
     avail_walls.each do |avail_wall|
-      zvalues = getSurfaceZValues([avail_wall])
+      zvalues = get_surface_z_values([avail_wall])
       minz = zvalues.min + avail_wall.space.get.zOrigin
       if minz < min_story_avail_wall_minz
         min_story_avail_walls.clear
@@ -1544,13 +1551,13 @@ class Geometry
         multy = 1
       end
       if (facade == Constants.FacadeBack) || (facade == Constants.FacadeLeft)
-        leftx = getSurfaceXValues([min_story_avail_wall]).max
-        lefty = getSurfaceYValues([min_story_avail_wall]).max
+        leftx = get_surface_x_values([min_story_avail_wall]).max
+        lefty = get_surface_y_values([min_story_avail_wall]).max
       else
-        leftx = getSurfaceXValues([min_story_avail_wall]).min
-        lefty = getSurfaceYValues([min_story_avail_wall]).min
+        leftx = get_surface_x_values([min_story_avail_wall]).min
+        lefty = get_surface_y_values([min_story_avail_wall]).min
       end
-      bottomz = getSurfaceZValues([min_story_avail_wall]).min
+      bottomz = get_surface_z_values([min_story_avail_wall]).min
 
       [upperleft, lowerleft, lowerright, upperright].each do |coord|
         newx = UnitConversions.convert(leftx + multx * coord[0], 'ft', 'm')
@@ -1647,27 +1654,27 @@ class Geometry
     ne_point = OpenStudio::Point3d.new(x, 0, rim_joist_height)
     sw_point = OpenStudio::Point3d.new(0, -y, rim_joist_height)
     se_point = OpenStudio::Point3d.new(x, -y, rim_joist_height)
-    living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+    conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
 
     # foundation
     foundation_polygon = nil
     if (foundation_height > 0) && foundation_polygon.nil?
-      foundation_polygon = living_polygon
+      foundation_polygon = conditioned_polygon
     end
 
-    # create living zone
-    living_zone = OpenStudio::Model::ThermalZone.new(model)
-    living_zone.setName(HPXML::LocationLivingSpace)
+    # create conditioned zone
+    conditioned_zone = OpenStudio::Model::ThermalZone.new(model)
+    conditioned_zone.setName(HPXML::LocationConditionedSpace)
 
     # first floor
-    living_space = OpenStudio::Model::Space::fromFloorPrint(living_polygon, average_ceiling_height, model)
-    living_space = living_space.get
-    assign_indexes(model, living_polygon, living_space)
-    living_space.setName(HPXML::LocationLivingSpace)
-    living_space_type = OpenStudio::Model::SpaceType.new(model)
-    living_space_type.setStandardsSpaceType(HPXML::LocationLivingSpace)
-    living_space.setSpaceType(living_space_type)
-    living_space.setThermalZone(living_zone)
+    conditioned_space = OpenStudio::Model::Space::fromFloorPrint(conditioned_polygon, average_ceiling_height, model)
+    conditioned_space = conditioned_space.get
+    assign_indexes(model, conditioned_polygon, conditioned_space)
+    conditioned_space.setName(HPXML::LocationConditionedSpace)
+    conditioned_space_type = OpenStudio::Model::SpaceType.new(model)
+    conditioned_space_type.setStandardsSpaceType(HPXML::LocationConditionedSpace)
+    conditioned_space.setSpaceType(conditioned_space_type)
+    conditioned_space.setThermalZone(conditioned_zone)
 
     # Adiabatic surfaces for walls
     adb_facade_hash = { 'left' => adiabatic_left_wall, 'right' => adiabatic_right_wall, 'front' => adiabatic_front_wall, 'back' => adiabatic_back_wall }
@@ -1681,8 +1688,8 @@ class Geometry
         next unless adb_facades.include? os_facade
 
         x_ft = UnitConversions.convert(x, 'm', 'ft')
-        max_x = getSurfaceXValues([surface]).max
-        min_x = getSurfaceXValues([surface]).min
+        max_x = get_surface_x_values([surface]).max
+        min_x = get_surface_x_values([surface]).min
         next if ((max_x - x_ft).abs >= 0.01) && (min_x > 0)
 
         surface.setOutsideBoundaryCondition('Adiabatic')
@@ -1691,15 +1698,15 @@ class Geometry
 
     # additional floors
     for story in 2..num_floors
-      new_living_space = living_space.clone.to_Space.get
-      assign_indexes(model, living_polygon, new_living_space)
-      new_living_space.setName("living space|story #{story}")
-      new_living_space.setSpaceType(living_space_type)
+      new_conditioned_space = conditioned_space.clone.to_Space.get
+      assign_indexes(model, conditioned_polygon, new_conditioned_space)
+      new_conditioned_space.setName("conditioned space|story #{story}")
+      new_conditioned_space.setSpaceType(conditioned_space_type)
 
       m = initialize_transformation_matrix(OpenStudio::Matrix.new(4, 4, 0))
       m[2, 3] = average_ceiling_height * (story - 1)
-      new_living_space.setTransformation(OpenStudio::Transformation.new(m))
-      new_living_space.setThermalZone(living_zone)
+      new_conditioned_space.setTransformation(OpenStudio::Transformation.new(m))
+      new_conditioned_space.setThermalZone(conditioned_zone)
     end
 
     # attic
@@ -1707,10 +1714,10 @@ class Geometry
     if attic_type != HPXML::AtticTypeFlatRoof
       attic_space = get_attic_space(model, x, y, average_ceiling_height, num_floors, roof_pitch, roof_type, rim_joist_height)
       if attic_type == HPXML::AtticTypeConditioned
-        attic_space_name = HPXML::LocationLivingSpace
+        attic_space_name = HPXML::LocationConditionedSpace
         attic_space.setName(attic_space_name)
-        attic_space.setThermalZone(living_zone)
-        attic_space.setSpaceType(living_space_type)
+        attic_space.setThermalZone(conditioned_zone)
+        attic_space.setSpaceType(conditioned_space_type)
         attic_space_type = OpenStudio::Model::SpaceType.new(model)
         attic_space_type.setStandardsSpaceType(attic_space_name)
       else
@@ -1782,7 +1789,7 @@ class Geometry
           os_facade = get_facade_for_surface(surface)
           if adb_facades.include? os_facade
             surface.setOutsideBoundaryCondition('Adiabatic')
-          elsif getSurfaceZValues([surface]).min < 0
+          elsif get_surface_z_values([surface]).min < 0
             surface.setOutsideBoundaryCondition('Foundation') if foundation_type != HPXML::FoundationTypeAmbient
             surface.setOutsideBoundaryCondition('Outdoors') if foundation_type == HPXML::FoundationTypeAmbient
           else
@@ -1835,8 +1842,8 @@ class Geometry
         next unless adb_facades.include? os_facade
 
         x_ft = UnitConversions.convert(x, 'm', 'ft')
-        max_x = getSurfaceXValues([surface]).max
-        min_x = getSurfaceXValues([surface]).min
+        max_x = get_surface_x_values([surface]).max
+        min_x = get_surface_x_values([surface]).min
         next if ((max_x - x_ft).abs >= 0.01) && (min_x > 0)
 
         surface.setOutsideBoundaryCondition('Adiabatic')
@@ -2016,26 +2023,26 @@ class Geometry
     ne_point = OpenStudio::Point3d.new(x, 0, rim_joist_height)
     sw_point = OpenStudio::Point3d.new(0, -y, rim_joist_height)
     se_point = OpenStudio::Point3d.new(x, -y, rim_joist_height)
-    living_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
+    conditioned_polygon = make_polygon(sw_point, nw_point, ne_point, se_point)
 
     # foundation
     if (foundation_height > 0) && foundation_polygon.nil?
-      foundation_polygon = living_polygon
+      foundation_polygon = conditioned_polygon
     end
 
-    # create living zone
-    living_zone = OpenStudio::Model::ThermalZone.new(model)
-    living_zone.setName(HPXML::LocationLivingSpace)
+    # create conditioned zone
+    conditioned_zone = OpenStudio::Model::ThermalZone.new(model)
+    conditioned_zone.setName(HPXML::LocationConditionedSpace)
 
     # first floor
-    living_space = OpenStudio::Model::Space::fromFloorPrint(living_polygon, average_ceiling_height, model)
-    living_space = living_space.get
-    assign_indexes(model, living_polygon, living_space)
-    living_space.setName(HPXML::LocationLivingSpace)
-    living_space_type = OpenStudio::Model::SpaceType.new(model)
-    living_space_type.setStandardsSpaceType(HPXML::LocationLivingSpace)
-    living_space.setSpaceType(living_space_type)
-    living_space.setThermalZone(living_zone)
+    conditioned_space = OpenStudio::Model::Space::fromFloorPrint(conditioned_polygon, average_ceiling_height, model)
+    conditioned_space = conditioned_space.get
+    assign_indexes(model, conditioned_polygon, conditioned_space)
+    conditioned_space.setName(HPXML::LocationConditionedSpace)
+    conditioned_space_type = OpenStudio::Model::SpaceType.new(model)
+    conditioned_space_type.setStandardsSpaceType(HPXML::LocationConditionedSpace)
+    conditioned_space.setSpaceType(conditioned_space_type)
+    conditioned_space.setThermalZone(conditioned_zone)
 
     # Map surface facades to adiabatic walls
     adb_facade_hash = { 'left' => adiabatic_left_wall, 'right' => adiabatic_right_wall, 'front' => adiabatic_front_wall, 'back' => adiabatic_back_wall }
@@ -2050,15 +2057,15 @@ class Geometry
       adb_levels += ['Floor']
     end
 
-    # Make living space surfaces adiabatic
+    # Make conditioned space surfaces adiabatic
     model.getSpaces.each do |space|
       space.surfaces.each do |surface|
         os_facade = get_facade_for_surface(surface)
         if surface.surfaceType == 'Wall'
           if adb_facades.include? os_facade
             x_ft = UnitConversions.convert(x, 'm', 'ft')
-            max_x = getSurfaceXValues([surface]).max
-            min_x = getSurfaceXValues([surface]).min
+            max_x = get_surface_x_values([surface]).max
+            min_x = get_surface_x_values([surface]).min
             next if ((max_x - x_ft).abs >= 0.01) && (min_x > 0)
 
             surface.setOutsideBoundaryCondition('Adiabatic')
@@ -2141,7 +2148,7 @@ class Geometry
           os_facade = get_facade_for_surface(surface)
           if adb_facades.include?(os_facade) && (os_facade != 'RoofCeiling') && (os_facade != 'Floor')
             surface.setOutsideBoundaryCondition('Adiabatic')
-          elsif getSurfaceZValues([surface]).min < 0
+          elsif get_surface_z_values([surface]).min < 0
             surface.setOutsideBoundaryCondition('Foundation') if foundation_type != HPXML::FoundationTypeAmbient
             surface.setOutsideBoundaryCondition('Outdoors') if foundation_type == HPXML::FoundationTypeAmbient
           else
@@ -2191,8 +2198,8 @@ class Geometry
         next unless adb_facades.include? os_facade
 
         x_ft = UnitConversions.convert(x, 'm', 'ft')
-        max_x = getSurfaceXValues([surface]).max
-        min_x = getSurfaceXValues([surface]).min
+        max_x = get_surface_x_values([surface]).max
+        min_x = get_surface_x_values([surface]).min
         next if ((max_x - x_ft).abs >= 0.01) && (min_x > 0)
 
         surface.setOutsideBoundaryCondition('Adiabatic')
@@ -2226,7 +2233,7 @@ class Geometry
 
   # Shift all spaces up by foundation height for ambient foundation
   def self.apply_ambient_foundation_shift(model, foundation_type, foundation_height)
-    if foundation_type == HPXML::FoundationTypeAmbient
+    if [HPXML::FoundationTypeAmbient, HPXML::FoundationTypeBellyAndWing].include?(foundation_type)
       m = initialize_transformation_matrix(OpenStudio::Matrix.new(4, 4, 0))
       m[2, 3] = -foundation_height
       model.getSpaces.each do |space|
@@ -2368,9 +2375,9 @@ class Geometry
     edge_counter = 0
     surfaces.each do |surface|
       if use_top_edge
-        matchz = getSurfaceZValues([surface]).max
+        matchz = get_surface_z_values([surface]).max
       else
-        matchz = getSurfaceZValues([surface]).min
+        matchz = get_surface_z_values([surface]).min
       end
 
       # get vertices
@@ -2428,46 +2435,6 @@ class Geometry
     return facade
   end
 
-  # Return an array of x values for surfaces passed in. The values will be relative to the parent origin. This was intended for spaces.
-  def self.getSurfaceXValues(surfaceArray)
-    xValueArray = []
-    surfaceArray.each do |surface|
-      surface.vertices.each do |vertex|
-        xValueArray << UnitConversions.convert(vertex.x, 'm', 'ft').round(5)
-      end
-    end
-    return xValueArray
-  end
-
-  # Return an array of y values for surfaces passed in. The values will be relative to the parent origin. This was intended for spaces.
-  def self.getSurfaceYValues(surfaceArray)
-    yValueArray = []
-    surfaceArray.each do |surface|
-      surface.vertices.each do |vertex|
-        yValueArray << UnitConversions.convert(vertex.y, 'm', 'ft').round(5)
-      end
-    end
-    return yValueArray
-  end
-
-  def self.get_surface_length(surface)
-    xvalues = getSurfaceXValues([surface])
-    yvalues = getSurfaceYValues([surface])
-    xrange = xvalues.max - xvalues.min
-    yrange = yvalues.max - yvalues.min
-    if xrange > yrange
-      return xrange
-    end
-
-    return yrange
-  end
-
-  def self.get_surface_height(surface)
-    zvalues = getSurfaceZValues([surface])
-    zrange = zvalues.max - zvalues.min
-    return zrange
-  end
-
   def self.get_conditioned_attic_height(spaces)
     # gable roof type
     get_conditioned_spaces(spaces).each do |space|
@@ -2494,8 +2461,8 @@ class Geometry
   end
 
   def self.surface_is_rim_joist(surface, height)
-    return false unless (height - Geometry.get_surface_height(surface)).abs < 0.00001
-    return false unless Geometry.getSurfaceZValues([surface]).max > 0
+    return false unless (height - get_surface_height(surface)).abs < 0.00001
+    return false unless get_surface_z_values([surface]).max > 0
 
     return true
   end