openstudio-standards 0.3.0 → 0.3.1.rc1

data/lib/openstudio-standards/hvac_sizing/Siz.ThermalZone.rb

@@ -2,48 +2,20 @@
 # open the class to add methods to return sizing values
 class OpenStudio::Model::ThermalZone
 
-  # Sets all auto-sizeable fields to autosize
-  def autosize
-    self.autosizeDesignOutdoorAirFlowRate
-  end
-
-  # Takes the values calculated by the EnergyPlus sizing routines
-  # and puts them into this object model in place of the autosized fields.
-  # Must have previously completed a run with sql output for this to work.
-  def applySizingValues
-
-    # In OpenStudio, the design OA flow rates are calculated by the
-    # Controller:OutdoorAir object associated with this system.
-    # Therefore, this property will be retrieved from that object's sizing values
-    air_loop = self.airLoopHVAC
-    if air_loop.airLoopHVACOutdoorAirSystem.is_initialized
-      controller_oa = air_loop.airLoopHVACOutdoorAirSystem.get.getControllerOutdoorAir
-      # get the max oa flow rate from the controller:outdoor air sizing
-      maximum_outdoor_air_flow_rate = controller_oa.autosizedMaximumOutdoorAirFlowRate
-      if maximum_outdoor_air_flow_rate.is_initialized
-        self.setDesignOutdoorAirFlowRate(maximum_outdoor_air_flow_rate.get)
-        # Set the OA flow method to "ZoneSum" to avoid severe errors
-        # in the fully hard-sized model.
-        self.setSystemOutdoorAirMethod("ZoneSum")
-      end
-    end
-    
-  end
-
   # returns the autosized maximum outdoor air flow rate as an optional double
   def autosizedMaximumOutdoorAirFlowRate
 
-    return self.model.getAutosizedValue(self, 'Maximum Outdoor Air Flow Rate', 'm3/s')
-    
+    return self.getAutosizedValue('Maximum Outdoor Air Flow Rate', 'm3/s')
+
   end
-  
+
   # returns the autosized minimum outdoor air flow rate as an optional double
   def autosizedMinimumOutdoorAirFlowRate
 
-    return self.model.getAutosizedValue(self, 'Minimum Outdoor Air Flow Rate', 'm3/s')
-    
+    return self.getAutosizedValue('Minimum Outdoor Air Flow Rate', 'm3/s')
+
   end
-  
+
   # returns the autosized cooling design air flow rate as an optional double
   def autosizedCoolingDesignAirFlowRate
 
@@ -52,29 +24,29 @@ class OpenStudio::Model::ThermalZone
     name = self.name.get.upcase
 
     sql = self.model.sqlFile
-    
+
     if sql.is_initialized
       sql = sql.get
-    
+
       # In E+ 8.4, (OS 1.9.3 onward) the table name changed
       table_name = nil
       if self.model.version < OpenStudio::VersionString.new('1.9.3')
         table_name = 'Zone Cooling'
       else
         table_name = 'Zone Sensible Cooling'
-      end  
-    
-      query = "SELECT Value 
+      end
+
+      query = "SELECT Value
               FROM tabulardatawithstrings
-              WHERE ReportName='HVACSizingSummary' 
-              AND ReportForString='Entire Facility' 
+              WHERE ReportName='HVACSizingSummary'
+              AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='User Design Air Flow'
               AND RowName='#{name}'
               AND Units='m3/s'"
 
       val = sql.execAndReturnFirstDouble(query)
-      
+
       if val.is_initialized
         result = OpenStudio::OptionalDouble.new(val.get)
       else
@@ -97,29 +69,29 @@ class OpenStudio::Model::ThermalZone
     name = self.name.get.upcase
 
     sql = self.model.sqlFile
-    
+
     if sql.is_initialized
       sql = sql.get
-    
+
       # In E+ 8.4, (OS 1.9.3 onward) the table name changed
       table_name = nil
       if self.model.version < OpenStudio::VersionString.new('1.9.3')
         table_name = 'Zone Heating'
       else
         table_name = 'Zone Sensible Heating'
-      end    
-    
-      query = "SELECT Value 
+      end
+
+      query = "SELECT Value
               FROM tabulardatawithstrings
-              WHERE ReportName='HVACSizingSummary' 
-              AND ReportForString='Entire Facility' 
+              WHERE ReportName='HVACSizingSummary'
+              AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='User Design Air Flow'
               AND RowName='#{name}'
               AND Units='m3/s'"
 
       val = sql.execAndReturnFirstDouble(query)
-      
+
       if val.is_initialized
         result = OpenStudio::OptionalDouble.new(val.get)
       else
@@ -136,35 +108,35 @@ class OpenStudio::Model::ThermalZone
 
   # returns the calculated cooling design load as an optional double
   def coolingDesignLoad
-  
+
     result = OpenStudio::OptionalDouble.new
 
     name = self.name.get.upcase
 
     sql = self.model.sqlFile
-    
+
     if sql.is_initialized
       sql = sql.get
-    
+
       # In E+ 8.4, (OS 1.9.3 onward) the table name changed
       table_name = nil
       if self.model.version < OpenStudio::VersionString.new('1.9.3')
         table_name = 'Zone Cooling'
       else
         table_name = 'Zone Sensible Cooling'
-      end    
-    
-      query = "SELECT Value 
+      end
+
+      query = "SELECT Value
               FROM tabulardatawithstrings
-              WHERE ReportName='HVACSizingSummary' 
-              AND ReportForString='Entire Facility' 
+              WHERE ReportName='HVACSizingSummary'
+              AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='User Design Load'
               AND RowName='#{name}'
               AND Units='W'"
 
       val = sql.execAndReturnFirstDouble(query)
-      
+
       if val.is_initialized
         floor_area_no_multiplier_m2 = self.floorArea
         floor_area_m2 = floor_area_no_multiplier_m2 * self.multiplier
@@ -178,10 +150,10 @@ class OpenStudio::Model::ThermalZone
       OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', 'Model has no sql file containing results, cannot lookup data.')
     end
 
-    return result  
-  
+    return result
+
   end
-  
+
   def designAirFlowRate
 
     result = OpenStudio::OptionalDouble.new
@@ -189,17 +161,17 @@ class OpenStudio::Model::ThermalZone
     name = self.name.get.upcase
 
     sql = self.model.sqlFile
-    
+
     if sql.is_initialized
       sql = sql.get
-      
+
       table_name = 'Zone Sizing Information'
 
       # Get zone row name
       query = "SELECT RowName
               FROM tabulardatawithstrings
-              WHERE ReportName='Initialization Summary' 
-              AND ReportForString='Entire Facility' 
+              WHERE ReportName='Initialization Summary'
+              AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='Zone Name'
               AND Value='#{name}'"
@@ -217,32 +189,32 @@ class OpenStudio::Model::ThermalZone
         end
         htg_des_air_flow_rate = 0
         clg_des_air_flow_rate = 0
-        
+
         # Get zone cooling design flow rate
-        query = "SELECT Value 
+        query = "SELECT Value
                 FROM tabulardatawithstrings
-                WHERE ReportName='Initialization Summary' 
-                AND ReportForString='Entire Facility' 
+                WHERE ReportName='Initialization Summary'
+                AND ReportForString='Entire Facility'
                 AND TableName='#{table_name}'
                 AND ColumnName='User Des Air Flow Rate {m3/s}'
                 AND RowName='#{clg_id}'"
         val = sql.execAndReturnFirstDouble(query)
-        if val.is_initialized  
+        if val.is_initialized
           clg_des_air_flow_rate = val
         else
           OpenStudio::logFree(OpenStudio::Warn, "openstudio.model.Model", "Data not found for query: #{query}")
         end
 
         # Get zone heating design flow rate
-        query = "SELECT Value 
+        query = "SELECT Value
                 FROM tabulardatawithstrings
-                WHERE ReportName='Initialization Summary' 
-                AND ReportForString='Entire Facility' 
+                WHERE ReportName='Initialization Summary'
+                AND ReportForString='Entire Facility'
                 AND TableName='#{table_name}'
                 AND ColumnName='User Des Air Flow Rate {m3/s}'
                 AND RowName='#{htg_id}'"
         val = sql.execAndReturnFirstDouble(query)
-        if val.is_initialized  
+        if val.is_initialized
           htg_des_air_flow_rate = val
         else
           OpenStudio::logFree(OpenStudio::Warn, "openstudio.model.Model", "Data not found for query: #{query}")
@@ -263,16 +235,16 @@ class OpenStudio::Model::ThermalZone
 
   # returns the calculated heating design load as an optional double
   def heatingDesignLoad
-  
+
     result = OpenStudio::OptionalDouble.new
 
     name = self.name.get.upcase
 
     sql = self.model.sqlFile
-    
+
     if sql.is_initialized
       sql = sql.get
-      
+
       # In E+ 8.4, (OS 1.9.3 onward) the table name changed
       table_name = nil
       if self.model.version < OpenStudio::VersionString.new('1.9.3')
@@ -280,18 +252,18 @@ class OpenStudio::Model::ThermalZone
       else
         table_name = 'Zone Sensible Heating'
       end
-      
-      query = "SELECT Value 
+
+      query = "SELECT Value
               FROM tabulardatawithstrings
-              WHERE ReportName='HVACSizingSummary' 
-              AND ReportForString='Entire Facility' 
+              WHERE ReportName='HVACSizingSummary'
+              AND ReportForString='Entire Facility'
               AND TableName='#{table_name}'
               AND ColumnName='User Design Load'
               AND RowName='#{name}'
               AND Units='W'"
 
       val = sql.execAndReturnFirstDouble(query)
-      
+
       if val.is_initialized
         floor_area_no_multiplier_m2 = self.floorArea
         floor_area_m2 = floor_area_no_multiplier_m2 * self.multiplier
@@ -305,8 +277,8 @@ class OpenStudio::Model::ThermalZone
       OpenStudio::logFree(OpenStudio::Error, 'openstudio.model.Model', 'Model has no sql file containing results, cannot lookup data.')
     end
 
-    return result  
-  
+    return result
+
   end
 
   # Determine the zone heating fuels, including
@@ -314,14 +286,14 @@ class OpenStudio::Model::ThermalZone
   # the air loops serving the zone, and any plant loops
   # serving those air loops.
   #
-  # return [Array<String>] An array. Possible values are 
+  # return [Array<String>] An array. Possible values are
   # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
-  # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
+  # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating,
   # and SolarEnergy.
   def heating_fuels
-  
+
     fuels = []
-    
+
     # Special logic for models imported from Sefaira.
     # In this case, the fuels are listed as a comment
     # above the Zone object.
@@ -338,7 +310,7 @@ class OpenStudio::Model::ThermalZone
         fuels.uniq.sort
       end
     end
-    
+
     # Check the zone hvac heating fuels
     fuels += self.model.zone_equipment_heating_fuels(self)
 
@@ -348,9 +320,9 @@ class OpenStudio::Model::ThermalZone
     OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.Model', "For #{name}, heating fuels = #{fuels.uniq.sort.join(', ')}.")
 
     return fuels.uniq.sort
-    
+
   end
- 
+
   # Determine the zone cooling fuels, including
   # any fuels used by zone equipment, reheat terminals,
   # the air loops serving the zone, and any plant loops
@@ -358,12 +330,12 @@ class OpenStudio::Model::ThermalZone
   #
   # return [Array<String>] An array. Possible values are
   # Electricity, NaturalGas, Propane, PropaneGas, FuelOilNo1, FuelOilNo2,
-  # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating, 
+  # Coal, Diesel, Gasoline, DistrictCooling, DistrictHeating,
   # and SolarEnergy.
   def cooling_fuels
-  
+
     fuels = []
-    
+
     # Check the zone hvac cooling fuels
     fuels += self.model.zone_equipment_cooling_fuels(self)
 
@@ -373,7 +345,7 @@ class OpenStudio::Model::ThermalZone
     OpenStudio::logFree(OpenStudio::Debug, 'openstudio.model.Model', "For #{name}, cooling fuels = #{fuels.uniq.sort.join(', ')}.")
 
     return fuels.uniq.sort
-    
-  end  
-  
+
+  end
+
 end

data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2016/ashrae_90_1_2016.Model.rb

@@ -279,6 +279,7 @@ class ASHRAE9012016 < ASHRAE901
     business_sensor.setName('Business_Sensor')
     business_sensor_name = business_sensor.name.to_s
 
+    space_types_affected = []
     zones.sort.each do |zone|
       spaces = zone.spaces
       if spaces.length != 1
@@ -286,34 +287,54 @@ class ASHRAE9012016 < ASHRAE901
       end
       space = spaces[0]
       space_lights = space.lights
+      lights_defined_by_spacetype = false
       if space_lights.empty?
         space_lights = space.spaceType.get.lights
+        lights_defined_by_spacetype = true
+        space_types_affected << space.spaceType
       end
       space_people = space.people
       if space_people.empty?
         space_people = space.spaceType.get.people
       end
 
-      next if space_lights.empty? # skip space with no lights
+      # guard clause to skip space with no lights
+      next if space_lights.empty? 
+
+      # if lights are defined at the space type level, clone each lights object and make it individual to the space
+      new_space_lights = []
+      if lights_defined_by_spacetype
+        space_lights.each do |lights|
+          new_lights = lights.clone.to_Lights.get
+          new_lights.setName("#{space.name}-#{lights.name}")
+          new_lights.setSpace(space)
+          new_space_lights << new_lights
+        end
+        space_lights = new_space_lights
+      end
 
       zone_name = zone.name.to_s
       next if zone_name =~ /data\s*center/i # skip data centers
 
-      # EnergyPlus v9.4 name change for EMS actuators
+      # EnergyPlus v9.4.0 / OpenStudio v3.1.0 variable name change from 'Zone Lights Electric Power' to 'Zone Lights Electricity Rate'
+      # EnergyPlus v9.6.0 / OpenStudio v3.3.0 added Space objects, variable name change from 'Zone Lights Electricity Rate' to 'Space Lights Electricity Rate'
       # https://github.com/NREL/OpenStudio/pull/4104
       if model.version < OpenStudio::VersionString.new('3.1.0')
         light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Zone Lights Electric Power')
-      else
+        key_name = zone_name
+      elsif model.version < OpenStudio::VersionString.new('3.3.0')
         light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Zone Lights Electricity Rate')
+        key_name = zone_name
+      else
+        light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Space Lights Electricity Rate')
+        key_name = space.name.to_s
       end
-      light_sensor.setKeyName(zone_name)
-      light_sensor.setName("#{zone_name}_LSr".gsub(/[\s-]/, ''))
+      light_sensor.setKeyName(key_name)
+      light_sensor.setName("#{key_name}_LSr".gsub(/[\s-]/, ''))
       light_sensor_name = light_sensor.name.to_s
 
-      floor_area = OpenStudio::Model::EnergyManagementSystemInternalVariable.new(model, 'Zone Floor Area')
-      floor_area.setInternalDataIndexKeyName(zone_name)
-      floor_area.setName("#{zone_name}_Area".gsub(/[\s-]/, ''))
-      floor_area_name = floor_area.name.to_s
+      # get the space floor area for calculations
+      space_floor_area = space.floorArea
 
       # account for multiple lights (also work for single light)
       big_light = space_lights[0] # find the light with highest power (assuming specified by watts/area)
@@ -337,20 +358,20 @@ class ASHRAE9012016 < ASHRAE901
         else
           light_x_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(light_x, 'Lights', 'Electricity Rate')
         end
-        light_x_actuator.setName("#{zone_name}_Light#{light_id}_Actuator".gsub(/[\s-]/, ''))
+        light_x_actuator.setName("#{key_name}_Light#{light_id}_Actuator".gsub(/[\s-]/, ''))
         light_x_actuator_name = light_x_actuator.name.to_s
         add_lights_prog_null += "\n      SET #{light_x_actuator_name} = NULL,"
         if light_x == big_light
-          add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0.02*#{floor_area_name}/0.09290304,"
+          add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0.02*#{space_floor_area}/0.09290304,"
           next
         end
         add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0,"
       end
 
       light_ems_prog = OpenStudio::Model::EnergyManagementSystemProgram.new(model)
-      light_ems_prog.setName("SET_#{zone_name}_Light_EMS_Program".gsub(/[\s-]/, ''))
+      light_ems_prog.setName("SET_#{key_name}_Light_EMS_Program".gsub(/[\s-]/, ''))
       light_ems_prog_body = <<-EMS
-      SET #{light_sensor_name}_IP=0.093*#{light_sensor_name}/#{floor_area_name},
+      SET #{light_sensor_name}_IP=0.093*#{light_sensor_name}/#{space_floor_area},
       IF (#{business_sensor_name} <= 0) && (#{light_sensor_name}_IP >= 0.02),#{add_lights_prog_0}
       ELSE,#{add_lights_prog_null}
       ENDIF
@@ -358,10 +379,16 @@ class ASHRAE9012016 < ASHRAE901
       light_ems_prog.setBody(light_ems_prog_body)
 
       light_ems_prog_manager = OpenStudio::Model::EnergyManagementSystemProgramCallingManager.new(model)
-      light_ems_prog_manager.setName("SET_#{zone_name}_Light_EMS_Program_Manager")
+      light_ems_prog_manager.setName("SET_#{key_name}_Light_EMS_Program_Manager")
       light_ems_prog_manager.setCallingPoint('AfterPredictorAfterHVACManagers')
       light_ems_prog_manager.addProgram(light_ems_prog)
     end
+
+    # remove lights at the space type level
+    space_types_affected.each do |space_type|
+      space_type.get.lights.each(&:remove)
+    end
+
     return true
   end
 end

data/lib/openstudio-standards/prototypes/ashrae_90_1/ashrae_90_1_2019/ashrae_90_1_2019.Model.rb

@@ -279,6 +279,7 @@ class ASHRAE9012019 < ASHRAE901
     business_sensor.setName('Business_Sensor')
     business_sensor_name = business_sensor.name.to_s
 
+    space_types_affected = []
     zones.sort.each do |zone|
       spaces = zone.spaces
       if spaces.length != 1
@@ -286,34 +287,54 @@ class ASHRAE9012019 < ASHRAE901
       end
       space = spaces[0]
       space_lights = space.lights
+      lights_defined_by_spacetype = false
       if space_lights.empty?
         space_lights = space.spaceType.get.lights
+        lights_defined_by_spacetype = true
+        space_types_affected << space.spaceType
       end
       space_people = space.people
       if space_people.empty?
         space_people = space.spaceType.get.people
       end
 
-      next if space_lights.empty? # skip space with no lights
+      # guard clause to skip space with no lights
+      next if space_lights.empty? 
+
+      # if lights are defined at the space type level, clone each lights object and make it individual to the space
+      new_space_lights = []
+      if lights_defined_by_spacetype
+        space_lights.each do |lights|
+          new_lights = lights.clone.to_Lights.get
+          new_lights.setName("#{space.name}-#{lights.name}")
+          new_lights.setSpace(space)
+          new_space_lights << new_lights
+        end
+        space_lights = new_space_lights
+      end
 
       zone_name = zone.name.to_s
       next if zone_name =~ /data\s*center/i # skip data centers
 
-      # EnergyPlus v9.4 name change for EMS actuators
+      # EnergyPlus v9.4.0 / OpenStudio v3.1.0 variable name change from 'Zone Lights Electric Power' to 'Zone Lights Electricity Rate'
+      # EnergyPlus v9.6.0 / OpenStudio v3.3.0 added Space objects, variable name change from 'Zone Lights Electricity Rate' to 'Space Lights Electricity Rate'
       # https://github.com/NREL/OpenStudio/pull/4104
       if model.version < OpenStudio::VersionString.new('3.1.0')
         light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Zone Lights Electric Power')
-      else
+        key_name = zone_name
+      elsif model.version < OpenStudio::VersionString.new('3.3.0')
         light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Zone Lights Electricity Rate')
+        key_name = zone_name
+      else
+        light_sensor = OpenStudio::Model::EnergyManagementSystemSensor.new(model, 'Space Lights Electricity Rate')
+        key_name = space.name.to_s
       end
-      light_sensor.setKeyName(zone_name)
-      light_sensor.setName("#{zone_name}_LSr".gsub(/[\s-]/, ''))
+      light_sensor.setKeyName(key_name)
+      light_sensor.setName("#{key_name}_LSr".gsub(/[\s-]/, ''))
       light_sensor_name = light_sensor.name.to_s
 
-      floor_area = OpenStudio::Model::EnergyManagementSystemInternalVariable.new(model, 'Zone Floor Area')
-      floor_area.setInternalDataIndexKeyName(zone_name)
-      floor_area.setName("#{zone_name}_Area".gsub(/[\s-]/, ''))
-      floor_area_name = floor_area.name.to_s
+      # get the space floor area for calculations
+      space_floor_area = space.floorArea
 
       # account for multiple lights (also work for single light)
       big_light = space_lights[0] # find the light with highest power (assuming specified by watts/area)
@@ -337,20 +358,20 @@ class ASHRAE9012019 < ASHRAE901
         else
           light_x_actuator = OpenStudio::Model::EnergyManagementSystemActuator.new(light_x, 'Lights', 'Electricity Rate')
         end
-        light_x_actuator.setName("#{zone_name}_Light#{light_id}_Actuator".gsub(/[\s-]/, ''))
+        light_x_actuator.setName("#{key_name}_Light#{light_id}_Actuator".gsub(/[\s-]/, ''))
         light_x_actuator_name = light_x_actuator.name.to_s
         add_lights_prog_null += "\n      SET #{light_x_actuator_name} = NULL,"
         if light_x == big_light
-          add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0.02*#{floor_area_name}/0.09290304,"
+          add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0.02*#{space_floor_area}/0.09290304,"
           next
         end
         add_lights_prog_0 += "\n      SET #{light_x_actuator_name} = 0,"
       end
 
       light_ems_prog = OpenStudio::Model::EnergyManagementSystemProgram.new(model)
-      light_ems_prog.setName("SET_#{zone_name}_Light_EMS_Program".gsub(/[\s-]/, ''))
+      light_ems_prog.setName("SET_#{key_name}_Light_EMS_Program".gsub(/[\s-]/, ''))
       light_ems_prog_body = <<-EMS
-      SET #{light_sensor_name}_IP=0.093*#{light_sensor_name}/#{floor_area_name},
+      SET #{light_sensor_name}_IP=0.093*#{light_sensor_name}/#{space_floor_area},
       IF (#{business_sensor_name} <= 0) && (#{light_sensor_name}_IP >= 0.02),#{add_lights_prog_0}
       ELSE,#{add_lights_prog_null}
       ENDIF
@@ -358,11 +379,16 @@ class ASHRAE9012019 < ASHRAE901
       light_ems_prog.setBody(light_ems_prog_body)
 
       light_ems_prog_manager = OpenStudio::Model::EnergyManagementSystemProgramCallingManager.new(model)
-      light_ems_prog_manager.setName("SET_#{zone_name}_Light_EMS_Program_Manager")
+      light_ems_prog_manager.setName("SET_#{key_name}_Light_EMS_Program_Manager")
       light_ems_prog_manager.setCallingPoint('AfterPredictorAfterHVACManagers')
       light_ems_prog_manager.addProgram(light_ems_prog)
     end
 
+    # remove lights at the space type level
+    space_types_affected.each do |space_type|
+      space_type.get.lights.each(&:remove)
+    end
+
     return true
   end
 end

data/lib/openstudio-standards/prototypes/common/buildings/Prototype.SuperMarket.rb

@@ -17,9 +17,6 @@ module SuperMarket
     # additional kitchen loads
     add_extra_equip_kitchen(model)
 
-    # reset bakery & deli OA reset
-    reset_bakery_deli_oa(model)
-
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished building type specific adjustments')
 
     return true
@@ -35,7 +32,7 @@ module SuperMarket
       space = model.getSpaceByName(space_name).get
       kitchen_definition = OpenStudio::Model::ElectricEquipmentDefinition.new(model)
       kitchen_definition.setName('kitchen load')
-      kitchen_definition.setDesignLevel(11_674.5)
+      kitchen_definition.setDesignLevel(11674.5)
       kitchen_definition.setFractionLatent(0.25)
       kitchen_definition.setFractionRadiant(0.3)
       kitchen_definition.setFractionLost(0.2)
@@ -79,25 +76,6 @@ module SuperMarket
     return true
   end
 
-  # reset bakery & deli OA from AEDG baseline model
-  #
-  # @param model [OpenStudio::Model::Model] OpenStudio model object
-  # @return [Bool] returns true if successful, false if not
-  def reset_bakery_deli_oa(model)
-    space_names = ['Deli', 'Bakery']
-    space_names.each do |space_name|
-      space_kitchen = model.getSpaceByName(space_name).get
-      ventilation = space_kitchen.designSpecificationOutdoorAir.get
-      ventilation.setOutdoorAirFlowperPerson(0)
-      ventilation.setOutdoorAirFlowperFloorArea(0.0015)
-      # case template
-      # when '90.1-2004','90.1-2007','90.1-2010', '90.1-2013', '90.1-2016', '90.1-2019',
-      #  ventilation.setOutdoorAirFlowRate(4.27112436)
-      # end
-    end
-    return true
-  end
-
   # update water heater loss coefficient
   #
   # @param model [OpenStudio::Model::Model] OpenStudio model object