honeybee-openstudio 2.6.7 → 2.7.2

data/lib/{from_honeybee → to_openstudio}/geometry/door.rb

@@ -1,7 +1,7 @@
 # *******************************************************************************
-# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable 
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
 # Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -29,22 +29,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # *******************************************************************************
 
-require 'from_honeybee/model_object'
-
-require 'openstudio'
+require 'honeybee/geometry/door'
 
-module FromHoneybee
-  class Door < ModelObject
-    attr_reader :errors, :warnings
+require 'to_openstudio/model_object'
 
-    def initialize(hash)
-      super(hash)
-      raise "Incorrect model type '#{@type}'" unless @type == 'Door'
-    end
-
-    def defaults
-      @@schema[:components][:schemas][:DoorEnergyPropertiesAbridged][:properties]
-    end
+module Honeybee
+  class Door
 
     def find_existing_openstudio_object(openstudio_model)
       object = openstudio_model.getSubSurfaceByName(@hash[:identifier])
@@ -59,14 +49,14 @@ module FromHoneybee
         os_vertices << OpenStudio::Point3d.new(vertex[0], vertex[1], vertex[2])
       end
       reordered_vertices = OpenStudio.reorderULC(os_vertices)
-      
+
       # triangulate subsurface if neccesary
       triangulated = false
       final_vertices_list = []
       matching_os_subsurfaces = []
       matching_os_subsurface_indices = []
       if reordered_vertices.size > 4
-      
+
         # if this door has a matched door, see if the other one has already been created
         # the matched door should have been converted to multiple subsurfaces
         if @hash[:boundary_condition][:type] == 'Surface'
@@ -80,33 +70,33 @@ module FromHoneybee
             end
           end
         end
-        
+
         # if other door is not already created, do the triangulation
         if final_vertices_list.empty?
-          
+
           # transform to face coordinates
           t = OpenStudio::Transformation::alignFace(reordered_vertices)
           tInv = t.inverse
           face_vertices = OpenStudio::reverse(tInv*reordered_vertices)
-          
+
           # no holes in the subsurface
           holes = OpenStudio::Point3dVectorVector.new
-          
+
           # triangulate surface
           triangles = OpenStudio::computeTriangulation(face_vertices, holes)
           if triangles.empty?
             raise "Failed to triangulate door #{@hash[:identifier]} with #{reordered_vertices.size} vertices"
           end
-          
+
           # create new list of surfaces
           triangles.each do |vertices|
             final_vertices_list << OpenStudio.reorderULC(OpenStudio::reverse(t*vertices))
           end
-          
+
           triangulated = true
-          
+
         end
-        
+
       else
         # reordered_vertices are good as is
         final_vertices_list << reordered_vertices
@@ -115,7 +105,7 @@ module FromHoneybee
       result = []
       final_vertices_list.each_with_index do |reordered_vertices, index|
         os_subsurface = OpenStudio::Model::SubSurface.new(reordered_vertices, openstudio_model)
-        
+
         if !matching_os_subsurfaces.empty?
           os_subsurface.setName(@hash[:identifier] + "..#{matching_os_subsurface_indices[index]}")
         elsif triangulated
@@ -123,7 +113,7 @@ module FromHoneybee
         else
           os_subsurface.setName(@hash[:identifier])
         end
-        
+
         # assign the construction if it exists
         if @hash[:properties][:energy][:construction]
           construction_identifier = @hash[:properties][:energy][:construction]
@@ -133,7 +123,7 @@ module FromHoneybee
             os_subsurface.setConstruction(os_construction)
           end
         end
-        
+
         # assign the boundary condition object if it's a Surface
         if @hash[:boundary_condition][:type] == 'Surface'
           if !matching_os_subsurfaces.empty?
@@ -153,8 +143,8 @@ module FromHoneybee
 
         result << os_subsurface
       end
-      
+
       return result
     end
   end # Door
-end # FromHoneybee
+end # Honeybee

data/lib/{from_honeybee → to_openstudio}/geometry/face.rb

@@ -1,7 +1,7 @@
 # *******************************************************************************
-# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable 
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
 # Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -29,29 +29,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # *******************************************************************************
 
-require 'from_honeybee/model_object'
-require 'from_honeybee/geometry/aperture'
-require 'from_honeybee/geometry/door'
+require 'honeybee/geometry/face'
 
-require 'openstudio'
+require 'to_openstudio/model_object'
 
-module FromHoneybee
+module Honeybee
   class Face < ModelObject
-    attr_reader :errors, :warnings
-
-    def initialize(hash = {})
-      super(hash)
-
-      raise "Incorrect model type '#{@type}'" unless @type == 'Face'
-    end
-
-    def defaults
-      @@schema[:components][:schemas][:FaceEnergyPropertiesAbridged][:properties]
-    end
-
-    def crack_defaults
-      @@schema[:components][:schemas][:AFNCrack][:properties]
-    end
 
     def find_existing_openstudio_object(openstudio_model)
       model_surf = openstudio_model.getSurfaceByName(@hash[:identifier])
@@ -68,7 +51,7 @@ module FromHoneybee
       reordered_vertices = OpenStudio.reorderULC(os_vertices)
 
       # create the openstudio surface and assign the type
-      os_surface = OpenStudio::Model::Surface.new(reordered_vertices, openstudio_model)     
+      os_surface = OpenStudio::Model::Surface.new(reordered_vertices, openstudio_model)
       os_surface.setName(@hash[:identifier])
       os_surface.setSurfaceType(@hash[:face_type])
 
@@ -96,15 +79,15 @@ module FromHoneybee
           if vent_crack[:flow_exponent]
             os_crack.	setAirMassFlowExponent(vent_crack[:flow_exponent])
           end
-          
+
           # if it's a Surface boundary condition ensure the neighbor is not written as a duplicate
           if @hash[:boundary_condition][:type] == 'Surface'
             $interior_afn_srf_hash[@hash[:boundary_condition][:boundary_condition_objects][0]] = true
           end
 
-          # create the AirflowNetworkSurface 
+          # create the AirflowNetworkSurface
           os_afn_srf = os_surface.getAirflowNetworkSurface(os_crack)
-          
+
         end
       end
 
@@ -114,7 +97,7 @@ module FromHoneybee
       when 'Outdoors'
         if @hash[:boundary_condition][:sun_exposure] == false
           os_surface.setSunExposure('NoSun')
-        else 
+        else
           os_surface.setSunExposure('SunExposed')
         end
         if @hash[:boundary_condition][:wind_exposure] == false
@@ -192,4 +175,4 @@ module FromHoneybee
       os_surface
     end
   end # Face
-end # FromHoneybee
+end # Honeybee

data/lib/{from_honeybee → to_openstudio}/geometry/room.rb

@@ -1,7 +1,7 @@
 # *******************************************************************************
-# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable 
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
 # Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -29,42 +29,19 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # *******************************************************************************
 
-require 'from_honeybee/model_object'
-
-require 'from_honeybee/geometry/face'
-require 'from_honeybee/geometry/shade'
+require 'honeybee/geometry/room'
 
-require 'from_honeybee/load/people'
-require 'from_honeybee/load/lighting'
-require 'from_honeybee/load/electric_equipment'
-require 'from_honeybee/load/gas_equipment'
-require 'from_honeybee/load/infiltration'
-require 'from_honeybee/load/ventilation'
-require 'from_honeybee/load/setpoint_thermostat'
-require 'from_honeybee/load/setpoint_humidistat'
-require 'from_honeybee/ventcool/opening'
-require 'from_honeybee/ventcool/control'
+require 'to_openstudio/model_object'
 
-require 'openstudio'
+module Honeybee
+  class Room
 
-module FromHoneybee
-  class Room < ModelObject
-    attr_reader :errors, :warnings
-
-    def initialize(hash = {})
-      super(hash)
-      raise "Incorrect model type '#{@type}'" unless @type == 'Room'
-      @unique_space_type = nil
-    end
-
-    def defaults
-      @@schema[:components][:schemas][:RoomEnergyPropertiesAbridged][:properties]
-    end
+    attr_reader :unique_space_type
 
     def find_existing_openstudio_object(openstudio_model)
       model_space = openstudio_model.getSpaceByName(@hash[:identifier])
       return model_space.get unless model_space.empty?
-      nil 
+      nil
     end
 
     def get_unique_space_type(openstudio_model, os_space)
@@ -76,15 +53,16 @@ module FromHoneybee
           space_type_object = space_type.get
           space_type_mod_obj = space_type_object.clone(openstudio_model)
           new_space_type = space_type_mod_obj.to_SpaceType.get
+          # give the space type a new unique name and assign it to the room
+          st_name = space_type_object.name
+          unless space_type.empty?
+            st_name = st_name.get
+          else
+            st_name = 'CustomSpaceType'
+          end
         else
           # create a new space type as there is currently none assigned to the room
           new_space_type = OpenStudio::Model::SpaceType.new(openstudio_model)
-        end
-        # give the space type a new unique name and assign it to the room
-        st_name = space_type_object.name
-        unless space_type.empty?
-          st_name = st_name.get
-        else
           st_name = 'CustomSpaceType'
         end
         new_space_type.setName(st_name + '_' + @hash[:identifier])
@@ -118,7 +96,7 @@ module FromHoneybee
         construction_set = openstudio_model.getDefaultConstructionSetByName(construction_set_identifier)
         unless construction_set.empty?
           default_construction_set = construction_set.get
-          os_space.setDefaultConstructionSet(default_construction_set) 
+          os_space.setDefaultConstructionSet(default_construction_set)
         end
       end
 
@@ -146,7 +124,7 @@ module FromHoneybee
         end
       end
       os_space.setBuildingStory(story)
-      
+
       # keep track of all window ventilation objects
       window_vent = {}
 
@@ -241,7 +219,7 @@ module FromHoneybee
         @hash[:outdoor_shades].each do |outdoor_shade|
           add_shade_to_group(openstudio_model, os_shd_group, outdoor_shade)
         end
-      end 
+      end
 
       #check whether there are any load objects on the room overriding the programtype
       if @hash[:properties][:energy][:people]
@@ -304,7 +282,7 @@ module FromHoneybee
       end
 
       # assign ventilation if it exists
-      if @hash[:properties][:energy][:ventilation] 
+      if @hash[:properties][:energy][:ventilation]
         unique_program = get_unique_space_type(openstudio_model, os_space)
         unique_program.resetDesignSpecificationOutdoorAir()
         custom_ventilation = VentilationAbridged.new(@hash[:properties][:energy][:ventilation])
@@ -365,7 +343,7 @@ module FromHoneybee
         end
         # add the control startegy of the ventilation openings using the EMS
         if @hash[:properties][:energy][:window_vent_control]
-          vent_control = VentilationControl.new(@hash[:properties][:energy][:window_vent_control])
+          vent_control = VentilationControlAbridged.new(@hash[:properties][:energy][:window_vent_control])
           vent_control.to_openstudio(
             openstudio_model, os_thermal_zone, operable_subfs, opening_factors)
         end
@@ -390,7 +368,7 @@ module FromHoneybee
       os_outdoor_shade = hb_outdoor_shade.to_openstudio(openstudio_model)
       os_outdoor_shade.setShadingSurfaceGroup(os_shd_group)
     end
-  
+
     # method to check for the closest-assigned interior ceiling or floor construction
     def closest_interior_construction(openstudio_model, os_space, surface_type)
       # first check the space-assigned construction set
@@ -461,4 +439,4 @@ module FromHoneybee
     end
 
   end #Room
-end #FromHoneybee
+end #Honeybee

data/lib/{from_honeybee → to_openstudio}/geometry/shade.rb

@@ -1,7 +1,7 @@
 # *******************************************************************************
-# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable 
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
 # Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -29,22 +29,12 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # *******************************************************************************
 
-require 'from_honeybee/model_object'
-
-require 'openstudio'
-
-module FromHoneybee
-  class Shade < ModelObject
-    attr_reader :errors, :warnings
+require 'honeybee/geometry/shade'
 
-    def initialize(hash)
-      super(hash)
-      raise "Incorrect model type '#{@type}'" unless @type == 'Shade'
-    end
+require 'to_openstudio/model_object'
 
-    def defaults
-      @@schema[:components][:schemas][:ShadeEnergyPropertiesAbridged][:properties]
-    end
+module Honeybee
+  class Shade
 
     def find_existing_openstudio_object(openstudio_model)
       object = openstudio_model.getSurfaceByName(@hash[:identifier])
@@ -82,8 +72,8 @@ module FromHoneybee
           os_shading_surface.setTransmittanceSchedule(os_schedule)
         end
       end
-  
+
       os_shading_surface
     end
   end #Shade
-end #FromHoneybee
+end #Honeybee

data/lib/{from_honeybee → to_openstudio}/hvac/Model.hvac.rb

@@ -1,7 +1,7 @@
 # *******************************************************************************
-# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable 
+# Honeybee OpenStudio Gem, Copyright (c) 2020, Alliance for Sustainable
 # Energy, LLC, Ladybug Tools LLC and other contributors. All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
 #
@@ -109,19 +109,22 @@ class OpenStudio::Model::Model
                                      zone_equipment_ventilation: false)
 
     when 'DOAS with fan coil chiller with baseboard electric'
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      zone_equipment_ventilation: false)
       standard.model_add_hvac_system(self, 'Baseboards', ht = 'Electricity', znht = nil, cl = nil, heated_zones)
 
     when 'DOAS with fan coil chiller with gas unit heaters'
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      zone_equipment_ventilation: false)
       standard.model_add_hvac_system(self, 'Unit Heaters', ht = 'NaturalGas', znht = nil, cl = nil, heated_zones)
 
     when 'DOAS with fan coil chiller with no heat'
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      zone_equipment_ventilation: false)
 
@@ -148,7 +151,7 @@ class OpenStudio::Model::Model
 
     when 'DOAS with fan coil air-cooled chiller with baseboard electric'
       standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
-                                     chilled_water_loop_cooling_type: 'AirCooled')
+                                     chilled_water_loop_cooling_type: 'AirCooled', air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      chilled_water_loop_cooling_type: 'AirCooled',
                                      zone_equipment_ventilation: false)
@@ -156,7 +159,7 @@ class OpenStudio::Model::Model
 
     when 'DOAS with fan coil air-cooled chiller with gas unit heaters'
       standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
-                                     chilled_water_loop_cooling_type: 'AirCooled')
+                                     chilled_water_loop_cooling_type: 'AirCooled', air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      chilled_water_loop_cooling_type: 'AirCooled',
                                      zone_equipment_ventilation: false)
@@ -164,7 +167,7 @@ class OpenStudio::Model::Model
 
     when 'DOAS with fan coil air-cooled chiller with no heat'
       standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'Electricity', zones,
-                                     chilled_water_loop_cooling_type: 'AirCooled')
+                                     chilled_water_loop_cooling_type: 'AirCooled', air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'Electricity', zones,
                                      chilled_water_loop_cooling_type: 'AirCooled',
                                      zone_equipment_ventilation: false)
@@ -185,19 +188,22 @@ class OpenStudio::Model::Model
                                      zone_equipment_ventilation: false)
 
     when 'DOAS with fan coil district chilled water with baseboard electric'
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
                                      zone_equipment_ventilation: false)
       standard.model_add_hvac_system(self, 'Baseboards', ht = 'Electricity', znht = nil, cl = nil, heated_zones)
 
     when 'DOAS with fan coil district chilled water with gas unit heaters'
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
                                      zone_equipment_ventilation: false)
       standard.model_add_hvac_system(self, 'Unit Heaters', ht = 'NaturalGas', znht = nil, cl = nil, heated_zones)
 
     when 'DOAS with fan coil district chilled water with no heat '
-      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones)
+      standard.model_add_hvac_system(self, 'DOAS', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
+                                     air_loop_heating_type: nil)
       standard.model_add_hvac_system(self, 'Fan Coil', ht = nil, znht = nil, cl = 'DistrictCooling', zones,
                                      zone_equipment_ventilation: false)