openstudio-standards 0.8.4 → 0.8.5.rc1

data/lib/openstudio-standards/standards/Standards.PlantLoop.rb

@@ -825,10 +825,10 @@ class Standard
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, pri_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, pri_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: pri_control_type)
       end
     end
 
@@ -836,10 +836,10 @@ class Standard
     plant_loop.demandComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, sec_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, sec_control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: sec_control_type)
       end
     end
 
@@ -869,7 +869,7 @@ class Standard
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type)
       end
     end
 
@@ -898,10 +898,10 @@ class Standard
     plant_loop.supplyComponents.each do |sc|
       if sc.to_PumpVariableSpeed.is_initialized
         pump = sc.to_PumpVariableSpeed.get
-        pump_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type)
       elsif sc.to_HeaderedPumpsVariableSpeed.is_initialized
         pump = sc.to_HeaderedPumpsVariableSpeed.get
-        headered_pumps_variable_speed_set_control_type(pump, control_type)
+        OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type)
       end
     end
 
@@ -1274,12 +1274,12 @@ class Standard
     plant_loop.supplyComponents.each do |component|
       if component.to_PumpConstantSpeed.is_initialized
         pump = component.to_PumpConstantSpeed.get
-        pump_rated_w_per_gpm = pump_rated_w_per_gpm(pump)
+        pump_rated_w_per_gpm = OpenstudioStandards::HVAC.pump_get_rated_w_per_gpm(pump)
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.PlantLoop', "'#{loop_type}' Loop #{plant_loop.name} - Primary (Supply) Constant Speed Pump '#{pump.name}' - pump_rated_w_per_gpm #{pump_rated_w_per_gpm} W/GPM")
         supply_w_per_gpm += pump_rated_w_per_gpm
       elsif component.to_PumpVariableSpeed.is_initialized
         pump = component.to_PumpVariableSpeed.get
-        pump_rated_w_per_gpm = pump_rated_w_per_gpm(pump)
+        pump_rated_w_per_gpm = OpenstudioStandards::HVAC.pump_get_rated_w_per_gpm(pump)
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.PlantLoop', "'#{loop_type}' Loop #{plant_loop.name} - Primary (Supply) VSD Pump '#{pump.name}' - pump_rated_w_per_gpm #{pump_rated_w_per_gpm} W/GPM")
         supply_w_per_gpm += pump_rated_w_per_gpm
       end
@@ -1291,12 +1291,12 @@ class Standard
     demand_pumps.each do |component|
       if component.to_PumpConstantSpeed.is_initialized
         pump = component.to_PumpConstantSpeed.get
-        pump_rated_w_per_gpm = pump_rated_w_per_gpm(pump)
+        pump_rated_w_per_gpm = OpenstudioStandards::HVAC.pump_get_rated_w_per_gpm(pump)
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.PlantLoop', "'#{loop_type}' Loop #{plant_loop.name} - Secondary (Demand) Constant Speed Pump '#{pump.name}' - pump_rated_w_per_gpm #{pump_rated_w_per_gpm} W/GPM")
         demand_w_per_gpm += pump_rated_w_per_gpm
       elsif component.to_PumpVariableSpeed.is_initialized
         pump = component.to_PumpVariableSpeed.get
-        pump_rated_w_per_gpm = pump_rated_w_per_gpm(pump)
+        pump_rated_w_per_gpm = OpenstudioStandards::HVAC.pump_get_rated_w_per_gpm(pump)
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.PlantLoop', "'#{loop_type}' Loop #{plant_loop.name} - Secondary (Demand) VSD Pump '#{pump.name}' - pump_rated_w_per_gpm #{pump_rated_w_per_gpm} W/GPM")
         demand_w_per_gpm += pump_rated_w_per_gpm
       end

data/lib/openstudio-standards/standards/Standards.Pump.rb

@@ -81,7 +81,7 @@ module Pump
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.Pump', "For #{pump.name}: motor nameplate = #{nominal_hp}HP, motor eff = #{(motor_efficiency * 100).round(2)}%; #{target_w_per_gpm.round} W/gpm translates to a pressure rise of #{pressure_rise_ft_h2o.round(2)} ftH2O.")
 
     # Calculate the W/gpm for verification
-    calculated_w = pump_pumppower(pump)
+    calculated_w = OpenstudioStandards::HVAC.pump_get_power(pump)
 
     calculated_w_per_gpm = calculated_w / flow_gpm
 
@@ -97,7 +97,7 @@ module Pump
   # @return [Boolean] returns true if successful, false if not
   def pump_apply_standard_minimum_motor_efficiency(pump)
     # Get the horsepower
-    bhp = pump_brake_horsepower(pump)
+    bhp = OpenstudioStandards::HVAC.pump_get_brake_horsepower(pump)
 
     # Find the motor efficiency
     motor_eff, nominal_hp = pump_standard_minimum_motor_efficiency_and_size(pump, bhp)
@@ -180,149 +180,4 @@ module Pump
 
     return [motor_eff, nominal_hp]
   end
-
-  # Determines the pump power (W) based on flow rate, pressure rise,
-  # and total pump efficiency(impeller eff * motor eff).
-  # Uses the E+ default assumption of 0.78 impeller efficiency.
-  #
-  # @param pump [OpenStudio::Model::StraightComponent] pump object, allowable types:
-  #   PumpConstantSpeed, PumpVariableSpeed
-  # @return [Double] pump power in watts
-  def pump_pumppower(pump)
-    # Get flow rate (whether autosized or hard-sized)
-    flow_m3_per_s = 0
-    flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.ratedFlowRate.is_initialized
-                        pump.ratedFlowRate.get
-                      elsif pump.autosizedRatedFlowRate.is_initialized
-                        pump.autosizedRatedFlowRate.get
-                      end
-                    elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.totalRatedFlowRate.is_initialized
-                        pump.totalRatedFlowRate.get
-                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get
-                      end
-                    end
-
-    # E+ default impeller efficiency
-    # http://bigladdersoftware.com/epx/docs/8-4/engineering-reference/component-sizing.html#pump-sizing
-    impeller_eff = 0.78
-
-    # Get the motor efficiency
-    motor_eff = pump.motorEfficiency
-
-    # Calculate the total efficiency
-    # which includes both motor and
-    # impeller efficiency.
-    pump_total_eff = impeller_eff * motor_eff
-
-    # Get the pressure rise (Pa)
-    pressure_rise_pa = pump.ratedPumpHead
-
-    # Calculate the pump power (W)
-    pump_power_w = pressure_rise_pa * flow_m3_per_s / pump_total_eff
-
-    return pump_power_w
-  end
-
-  # Determines the brake horsepower of the pump based on flow rate,
-  # pressure rise, and impeller efficiency.
-  #
-  # @param pump [OpenStudio::Model::StraightComponent] pump object, allowable types:
-  #   PumpConstantSpeed, PumpVariableSpeed
-  # @return [Double] brake horsepower
-  def pump_brake_horsepower(pump)
-    # Get flow rate (whether autosized or hard-sized)
-    # Get flow rate (whether autosized or hard-sized)
-    flow_m3_per_s = 0
-    flow_m3_per_s = if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-                      if pump.ratedFlowRate.is_initialized
-                        pump.ratedFlowRate.get
-                      elsif pump.autosizedRatedFlowRate.is_initialized
-                        pump.autosizedRatedFlowRate.get
-                      end
-                    elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-                      if pump.totalRatedFlowRate.is_initialized
-                        pump.totalRatedFlowRate.get
-                      elsif pump.autosizedTotalRatedFlowRate.is_initialized
-                        pump.autosizedTotalRatedFlowRate.get
-                      end
-                    end
-
-    # E+ default impeller efficiency
-    # http://bigladdersoftware.com/epx/docs/8-4/engineering-reference/component-sizing.html#pump-sizing
-    impeller_eff = 0.78
-
-    # Get the pressure rise (Pa)
-    pressure_rise_pa = pump.ratedPumpHead
-
-    # Calculate the pump power (W)
-    pump_power_w = pressure_rise_pa * flow_m3_per_s / impeller_eff
-
-    # Convert to HP
-    pump_power_hp = pump_power_w / 745.7 # 745.7 W/HP
-
-    return pump_power_hp
-  end
-
-  # Determines the horsepower of the pump motor, including motor efficiency and pump impeller efficiency.
-  #
-  # @param pump [OpenStudio::Model::StraightComponent] pump object, allowable types:
-  #   PumpConstantSpeed, PumpVariableSpeed
-  # @return [Double] motor horsepower
-  def pump_motor_horsepower(pump)
-    # Get the pump power
-    pump_power_w = pump_pumppower(pump)
-
-    # Convert to HP
-    pump_hp = pump_power_w / 745.7 # 745.7 W/HP
-
-    return pump_hp
-  end
-
-  # Determines the rated watts per GPM of the pump
-  #
-  # @param pump [OpenStudio::Model::StraightComponent] pump object, allowable types:
-  #   PumpConstantSpeed, PumpVariableSpeed
-  # @return [Double] rated power consumption per flow in watts per gpm, W*min/gal
-  def pump_rated_w_per_gpm(pump)
-    # Get design power (whether autosized or hard-sized)
-    rated_power_w = 0
-    if pump.ratedPowerConsumption.is_initialized
-      rated_power_w = pump.ratedPowerConsumption.get
-    elsif pump.autosizedRatedPowerConsumption.is_initialized
-      rated_power_w = pump.autosizedRatedPowerConsumption.get
-    else
-      OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump power consumption, cannot determine w per gpm correctly.")
-      return 0.0
-    end
-
-    rated_m3_per_s = 0
-    if pump.to_PumpVariableSpeed.is_initialized || pump.to_PumpConstantSpeed.is_initialized
-      if pump.ratedFlowRate.is_initialized
-        rated_m3_per_s = pump.ratedFlowRate.get
-      elsif pump.autosizedRatedFlowRate.is_initialized
-        rated_m3_per_s = pump.autosizedRatedFlowRate.get
-      else
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump Flow Rate, cannot determine w per gpm correctly.")
-        return 0.0
-      end
-    elsif pump.to_HeaderedPumpsVariableSpeed.is_initialized || pump.to_HeaderedPumpsConstantSpeed.is_initialized
-      if pump.totalRatedFlowRate.is_initialized
-        rated_m3_per_s = pump.totalRatedFlowRate.get
-      elsif pump.autosizedTotalRatedFlowRate.is_initialized
-        rated_m3_per_s = pump.autosizedTotalRatedFlowRate.get
-      else
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump Flow Rate, cannot determine w per gpm correctly.")
-        return 0.0
-      end
-    end
-
-    rated_w_per_m3s = rated_power_w / rated_m3_per_s
-
-    rated_w_per_gpm = OpenStudio.convert(rated_w_per_m3s, 'W*s/m^3', 'W*min/gal').get
-
-    return rated_w_per_gpm
-  end
 end

data/lib/openstudio-standards/standards/Standards.PumpVariableSpeed.rb

@@ -1,54 +1,70 @@
 class Standard
-  # @!group PumpVariableSpeed
-
   include Pump
 
-  # Set the pump curve coefficients based on the specified control type.
+  # Determine and set type of part load control type for heating and chilled
+  # water variable speed pumps
   #
-  # @param pump_variable_speed [OpenStudio::Model::PumpVariableSpeed] variable speed pump
-  # @param control_type [String] valid choices are Riding Curve, VSD No Reset, VSD DP Reset
-  def pump_variable_speed_set_control_type(pump_variable_speed, control_type)
-    # Determine the coefficients
-    coeff_a = nil
-    coeff_b = nil
-    coeff_c = nil
-    coeff_d = nil
-    case control_type
-    when 'Constant Flow'
-      coeff_a = 0.0
-      coeff_b = 1.0
-      coeff_c = 0.0
-      coeff_d = 0.0
-    when 'Riding Curve'
-      coeff_a = 0.0
-      coeff_b = 3.2485
-      coeff_c = -4.7443
-      coeff_d = 2.5294
-    when 'VSD No Reset'
-      coeff_a = 0.0
-      coeff_b = 0.5726
-      coeff_c = -0.301
-      coeff_d = 0.7347
-    when 'VSD DP Reset'
-      coeff_a = 0.0
-      coeff_b = 0.0205
-      coeff_c = 0.4101
-      coeff_d = 0.5753
+  # @param pump [OpenStudio::Model::PumpVariableSpeed] OpenStudio pump object
+  # @return [Boolean] Returns true if applicable, false otherwise
+  def pump_variable_speed_control_type(pump)
+    # Get plant loop
+    plant_loop = pump.plantLoop.get
+
+    # Get plant loop type
+    plant_loop_type = plant_loop.sizingPlant.loopType
+    return false unless plant_loop_type == 'Heating' || plant_loop_type == 'Cooling'
+
+    # Get rated pump power
+    if pump.ratedPowerConsumption.is_initialized
+      pump_rated_power_w = pump.ratedPowerConsumption.get
+    elsif pump.autosizedRatedPowerConsumption.is_initialized
+      pump_rated_power_w = pump.autosizedRatedPowerConsumption.get
     else
-      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.PumpVariableSpeed', "Pump control type '#{control_type}' not recognized, pump coefficients will not be changed.")
+      OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Pump', "For #{pump.name}, could not find rated pump power consumption, cannot determine w per gpm correctly.")
       return false
     end
 
-    # Set the coefficients
-    pump_variable_speed.setCoefficient1ofthePartLoadPerformanceCurve(coeff_a)
-    pump_variable_speed.setCoefficient2ofthePartLoadPerformanceCurve(coeff_b)
-    pump_variable_speed.setCoefficient3ofthePartLoadPerformanceCurve(coeff_c)
-    pump_variable_speed.setCoefficient4ofthePartLoadPerformanceCurve(coeff_d)
-    pump_variable_speed.setPumpControlType('Intermittent')
+    # Get nominal nameplate HP
+    pump_nominal_hp = pump_rated_power_w * pump.motorEfficiency / 745.7
+
+    # Assign peformance curves
+    control_type = pump_variable_speed_get_control_type(pump, plant_loop_type, pump_nominal_hp)
 
-    # Append the control type to the pump name
-    # self.setName("#{self.name} #{control_type}")
+    # Set pump part load performance curve coefficients
+    OpenstudioStandards::HVAC.pump_variable_speed_set_control_type(pump, control_type: control_type) if control_type
 
     return true
   end
+
+  # Determine type of pump part load control type
+  #
+  # @param pump [OpenStudio::Model::PumpVariableSpeed] OpenStudio pump object
+  # @param plant_loop_type [String] Type of plant loop
+  # @param pump_nominal_hp [Float] Pump nominal horsepower
+  # @return [String] Pump part load control type
+  def pump_variable_speed_get_control_type(pump, plant_loop_type, pump_nominal_hp)
+    # Get plant loop
+    plant_loop = pump.plantLoop.get
+
+    # Default assumptions are based on ASHRAE 90.1-2010 Appendix G (G3.1.3.5 and G3.1.3.10)
+    case plant_loop_type
+      when 'Heating'
+        # Determine the area served by the plant loop
+        area_served_m2 = plant_loop_total_floor_area_served(plant_loop)
+        area_served_ft2 = OpenStudio.convert(area_served_m2, 'm^2', 'ft^2').get
+
+        return 'VSD No Reset' if area_served_ft2 > 120_000
+
+        # else
+        return 'Riding Curve'
+      when 'Cooling'
+        # Get plant loop capacity capacity
+        cooling_capacity_w = plant_loop_total_cooling_capacity(plant_loop)
+
+        return 'VSD No Reset' if cooling_capacity_w >= 300
+
+        # else
+        return 'Riding Curve'
+    end
+  end
 end

data/lib/openstudio-standards/standards/Standards.SpaceType.rb

@@ -23,7 +23,7 @@ class Standard
     # lookup space type properties
     space_type_properties = model_find_object(standards_data['space_types'], search_criteria)
 
-    if space_type_properties.nil?
+    if space_type_properties.nil? || space_type_properties.empty?
       OpenStudio.logFree(OpenStudio::Warn, 'openstudio.standards.SpaceType', "Space type properties lookup failed: #{search_criteria}.")
       space_type_properties = {}
     end
@@ -97,7 +97,7 @@ class Standard
   # loads directly assigned to spaces.  This method skips plenums.
   #
   # @param space_type [OpenStudio::Model::SpaceType] space type object
-  # @param set_people [Boolean] if true, set the people density.
+  # @param set_people [Boolean] if true, set the people density. occupancy values are in the ventilation standard.
   #   Also, assign reasonable clothing, air velocity, and work efficiency inputs
   #   to allow reasonable thermal comfort metrics to be calculated.
   # @param set_lights [Boolean] if true, set the lighting density, lighting fraction
@@ -106,10 +106,8 @@ class Standard
   # @param set_gas_equipment [Boolean] if true, set the gas equipment density
   # @param set_ventilation [Boolean] if true, set the ventilation rates (per-person and per-area)
   # @return [Boolean] returns true if successful, false if not
-  def space_type_apply_internal_loads(space_type, set_people, set_lights, set_electric_equipment, set_gas_equipment, set_ventilation)
+  def space_type_apply_internal_loads(space_type, set_people: true, set_lights: true, set_electric_equipment: true, set_gas_equipment: true, set_ventilation: true)
     # Skip plenums
-    # Check if the space type name
-    # contains the word plenum.
     if space_type.name.get.to_s.downcase.include?('plenum')
       return false
     end
@@ -126,87 +124,9 @@ class Standard
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} was not found in the standards data.")
       return false
     end
-    # People
-    people_have_info = false
-    occupancy_per_area = space_type_properties['occupancy_per_area'].to_f
-    people_have_info = true unless occupancy_per_area.zero?
-
-    if set_people && people_have_info
-
-      # Remove all but the first instance
-      instances = space_type.people.sort
-      if instances.empty?
-        # Create a new definition and instance
-        definition = OpenStudio::Model::PeopleDefinition.new(space_type.model)
-        definition.setName("#{space_type.name} People Definition")
-        instance = OpenStudio::Model::People.new(definition)
-        instance.setName("#{space_type.name} People")
-        instance.setSpaceType(space_type)
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} had no people, one has been created.")
-        instances << instance
-      elsif instances.size > 1
-        instances.each_with_index do |inst, i|
-          next if i.zero?
 
-          OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "Removed #{inst.name} from #{space_type.name}.")
-          inst.remove
-        end
-      end
-
-      # Modify the definition of the instance
-      space_type.people.sort.each do |inst|
-        definition = inst.peopleDefinition
-        unless occupancy_per_area.zero?
-          definition.setPeopleperSpaceFloorArea(OpenStudio.convert(occupancy_per_area / 1000, 'people/ft^2', 'people/m^2').get)
-          OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set occupancy to #{occupancy_per_area} people/1000 ft^2.")
-        end
-
-        # set fraction radiant  ##
-        definition.setFractionRadiant(0.3)
-
-        # Clothing schedule for thermal comfort metrics
-        clothing_sch = space_type.model.getScheduleRulesetByName('Clothing Schedule')
-        if clothing_sch.is_initialized
-          clothing_sch = clothing_sch.get
-        else
-          clothing_sch = OpenStudio::Model::ScheduleRuleset.new(space_type.model)
-          clothing_sch.setName('Clothing Schedule')
-          clothing_sch.defaultDaySchedule.setName('Clothing Schedule Default Winter Clothes')
-          clothing_sch.defaultDaySchedule.addValue(OpenStudio::Time.new(0, 24, 0, 0), 1.0)
-          sch_rule = OpenStudio::Model::ScheduleRule.new(clothing_sch)
-          sch_rule.daySchedule.setName('Clothing Schedule Summer Clothes')
-          sch_rule.daySchedule.addValue(OpenStudio::Time.new(0, 24, 0, 0), 0.5)
-          sch_rule.setStartDate(OpenStudio::Date.new(OpenStudio::MonthOfYear.new(5), 1))
-          sch_rule.setEndDate(OpenStudio::Date.new(OpenStudio::MonthOfYear.new(9), 30))
-        end
-        inst.setClothingInsulationSchedule(clothing_sch)
-
-        # Air velocity schedule for thermal comfort metrics
-        air_velo_sch = space_type.model.getScheduleRulesetByName('Air Velocity Schedule')
-        if air_velo_sch.is_initialized
-          air_velo_sch = air_velo_sch.get
-        else
-          air_velo_sch = OpenStudio::Model::ScheduleRuleset.new(space_type.model)
-          air_velo_sch.setName('Air Velocity Schedule')
-          air_velo_sch.defaultDaySchedule.setName('Air Velocity Schedule Default')
-          air_velo_sch.defaultDaySchedule.addValue(OpenStudio::Time.new(0, 24, 0, 0), 0.2)
-        end
-        inst.setAirVelocitySchedule(air_velo_sch)
-
-        # Work efficiency schedule for thermal comfort metrics
-        work_efficiency_sch = space_type.model.getScheduleRulesetByName('Work Efficiency Schedule')
-        if work_efficiency_sch.is_initialized
-          work_efficiency_sch = work_efficiency_sch.get
-        else
-          work_efficiency_sch = OpenStudio::Model::ScheduleRuleset.new(space_type.model)
-          work_efficiency_sch.setName('Work Efficiency Schedule')
-          work_efficiency_sch.defaultDaySchedule.setName('Work Efficiency Schedule Default')
-          work_efficiency_sch.defaultDaySchedule.addValue(OpenStudio::Time.new(0, 24, 0, 0), 0)
-        end
-        inst.setWorkEfficiencySchedule(work_efficiency_sch)
-      end
-
-    end
+    # People
+    space_type_apply_people(space_type) if set_people
 
     # Lights
     lights_have_info = false
@@ -388,53 +308,7 @@ class Standard
     end
 
     # Ventilation
-    ventilation_have_info = false
-    ventilation_per_area = space_type_properties['ventilation_per_area'].to_f
-    ventilation_per_person = space_type_properties['ventilation_per_person'].to_f
-    ventilation_ach = space_type_properties['ventilation_air_changes'].to_f
-    ventilation_have_info = true unless ventilation_per_area.zero?
-    ventilation_have_info = true unless ventilation_per_person.zero?
-    ventilation_have_info = true unless ventilation_ach.zero?
-
-    # Get the design OA or create a new one if none exists
-    ventilation = space_type.designSpecificationOutdoorAir
-    if ventilation.is_initialized
-      ventilation = ventilation.get
-    else
-      ventilation = OpenStudio::Model::DesignSpecificationOutdoorAir.new(space_type.model)
-      ventilation.setName("#{space_type.name} Ventilation")
-      space_type.setDesignSpecificationOutdoorAir(ventilation)
-      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} had no ventilation specification, one has been created.")
-    end
-
-    if set_ventilation && ventilation_have_info
-
-      # Modify the ventilation properties
-      ventilation_method = model_ventilation_method(space_type.model)
-      ventilation.setOutdoorAirMethod(ventilation_method)
-      unless ventilation_per_area.zero?
-        ventilation.setOutdoorAirFlowperFloorArea(OpenStudio.convert(ventilation_per_area.to_f, 'ft^3/min*ft^2', 'm^3/s*m^2').get)
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set ventilation per area to #{ventilation_per_area} cfm/ft^2.")
-      end
-      unless ventilation_per_person.zero?
-        ventilation.setOutdoorAirFlowperPerson(OpenStudio.convert(ventilation_per_person.to_f, 'ft^3/min*person', 'm^3/s*person').get)
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set ventilation per person to #{ventilation_per_person} cfm/person.")
-      end
-      unless ventilation_ach.zero?
-        ventilation.setOutdoorAirFlowAirChangesperHour(ventilation_ach)
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set ventilation to #{ventilation_ach} ACH.")
-      end
-
-    elsif set_ventilation && !ventilation_have_info
-
-      # All space types must have a design spec OA
-      # object for ventilation controls to work correctly,
-      # even if the values are all zero.
-      ventilation.setOutdoorAirFlowperFloorArea(0)
-      ventilation.setOutdoorAirFlowperPerson(0)
-      ventilation.setOutdoorAirFlowAirChangesperHour(0)
-
-    end
+    space_type_apply_ventilation(space_type) if set_ventilation
 
     return true
   end
@@ -567,11 +441,8 @@ class Standard
   # @param set_lights [Boolean] if true, set the lighting schedule
   # @param set_electric_equipment [Boolean] if true, set the electric schedule schedule
   # @param set_gas_equipment [Boolean] if true, set the gas equipment density
-  # @param make_thermostat [Boolean] if true, makes a thermostat for this space type from the
-  #   schedules listed for the space type.  This thermostat is not hooked to any zone by this method,
-  #   but may be found and used later.
   # @return [Boolean] returns true if successful, false if not
-  def space_type_apply_internal_load_schedules(space_type, set_people, set_lights, set_electric_equipment, set_gas_equipment, set_ventilation, make_thermostat)
+  def space_type_apply_internal_load_schedules(space_type, set_people: true, set_lights: true, set_electric_equipment: true, set_gas_equipment: true, set_ventilation: true)
     # Get the standards data
     space_type_properties = space_type_get_standards_data(space_type)
 
@@ -599,14 +470,11 @@ class Standard
         default_sch_set.setPeopleActivityLevelSchedule(model_add_schedule(space_type.model, occupancy_activity_sch))
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set occupant activity schedule to #{occupancy_activity_sch}.")
       end
-
     end
 
     # Lights
     if set_lights
-
       apply_lighting_schedule(space_type, space_type_properties, default_sch_set)
-
     end
 
     # Electric Equipment
@@ -627,22 +495,31 @@ class Standard
       end
     end
 
-    # Thermostat
-    if make_thermostat
-      thermostat = OpenStudio::Model::ThermostatSetpointDualSetpoint.new(space_type.model)
-      thermostat.setName("#{space_type.name} Thermostat")
+    return true
+  end
 
-      heating_setpoint_sch = space_type_properties['heating_setpoint_schedule']
-      unless heating_setpoint_sch.nil?
-        thermostat.setHeatingSetpointTemperatureSchedule(model_add_schedule(space_type.model, heating_setpoint_sch))
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set heating setpoint schedule to #{heating_setpoint_sch}.")
-      end
+  # Makes a thermostat for this space type from the schedules listed for the space type.
+  # This thermostat is not hooked to any zone by this method,but may be found and used later.
+  #
+  # @param space_type [OpenStudio::Model::SpaceType] space type object
+  # @return [Boolean] returns true if successful, false if not
+  def space_type_apply_thermostat_schedules(space_type)
+    # Get the standards data
+    space_type_properties = space_type_get_standards_data(space_type)
 
-      cooling_setpoint_sch = space_type_properties['cooling_setpoint_schedule']
-      unless cooling_setpoint_sch.nil?
-        thermostat.setCoolingSetpointTemperatureSchedule(model_add_schedule(space_type.model, cooling_setpoint_sch))
-        OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set cooling setpoint schedule to #{cooling_setpoint_sch}.")
-      end
+    thermostat = OpenStudio::Model::ThermostatSetpointDualSetpoint.new(space_type.model)
+    thermostat.setName("#{space_type.name} Thermostat")
+
+    heating_setpoint_sch = space_type_properties['heating_setpoint_schedule']
+    unless heating_setpoint_sch.nil?
+      thermostat.setHeatingSetpointTemperatureSchedule(model_add_schedule(space_type.model, heating_setpoint_sch))
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set heating setpoint schedule to #{heating_setpoint_sch}.")
+    end
+
+    cooling_setpoint_sch = space_type_properties['cooling_setpoint_schedule']
+    unless cooling_setpoint_sch.nil?
+      thermostat.setCoolingSetpointTemperatureSchedule(model_add_schedule(space_type.model, cooling_setpoint_sch))
+      OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.SpaceType', "#{space_type.name} set cooling setpoint schedule to #{cooling_setpoint_sch}.")
     end
 
     return true