Standards.Model.rb in openstudio-standards-0.2.12.rc4

- old
+ new

@@ -1472,20 +1472,21 @@
 
   # Applies the HVAC parts of the template to all objects in the model using the the template specified in the model.
   def model_apply_hvac_efficiency_standard(model, climate_zone, apply_controls: true)
     sql_db_vars_map = {}
 
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', "Started applying HVAC efficiency standards for #{template} template.")
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.Model', "Started applying HVAC efficiency standards for #{template} template.")
 
     # Air Loop Controls
     if apply_controls.nil? || apply_controls == true
       model.getAirLoopHVACs.sort.each { |obj| air_loop_hvac_apply_standard_controls(obj, climate_zone) }
     end
 
     # Plant Loop Controls
-    # TODO refactor: enable this code (missing before refactor)
-    # getPlantLoops.sort.each { |obj| plant_loop_apply_standard_controls(obj, template, climate_zone) }
+    if apply_controls.nil? || apply_controls == true
+      model.getPlantLoops.sort.each { |obj| plant_loop_apply_standard_controls(obj, climate_zone) }
+    end
 
     # Zone HVAC Controls
     model.getZoneHVACComponents.sort.each { |obj| zone_hvac_component_apply_standard_controls(obj) }
 
     ##### Apply equipment efficiencies
@@ -1543,11 +1544,11 @@
     model.getHeatExchangerAirToAirSensibleAndLatents.each { |obj| heat_exchanger_air_to_air_sensible_and_latent_apply_efficiency(obj) }
 
     # Gas Heaters
     model.getCoilHeatingGass.sort.each { |obj| coil_heating_gas_apply_efficiency_and_curves(obj) }
 
-    OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Finished applying HVAC efficiency standards.')
+    OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.Model', "Finished applying HVAC efficiency standards for #{template} template.")
   end
 
   # Applies daylighting controls to each space in the model per the standard.
   def model_add_daylighting_controls(model)
     OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Model', 'Started adding daylighting controls.')
@@ -4024,9 +4025,13 @@
       building_type = 'LrgDCLowITE'
     elsif building_type == 'LargeDataCenterHighITE'
       building_type = 'LrgDCHighITE'
     elsif building_type == 'Laboratory'
       building_type = 'Laboratory'
+    elsif building_type == 'TallBuilding'
+      building_type = 'TallBldg'
+    elsif building_type == 'SuperTallBuilding'
+      building_type = 'SpTallBldg'
     end
 
     parts = [template]
 
     unless building_type.nil?