openstudio-standards 0.2.16.rc2 → 0.2.16

data/lib/openstudio-standards/prototypes/common/do_not_edit_metaclasses.rb

@@ -2970,9 +2970,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012004 CourtHouse.
-  class ASHRAE9012004CourtHouse < ASHRAE9012004
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012004 Courthouse.
+  class ASHRAE9012004Courthouse < ASHRAE9012004
+  @@building_type = "Courthouse"
   register_standard ("90.1-2004_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -2987,7 +2987,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012004CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012004Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -3004,7 +3004,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -6283,9 +6283,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012007 CourtHouse.
-  class ASHRAE9012007CourtHouse < ASHRAE9012007
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012007 Courthouse.
+  class ASHRAE9012007Courthouse < ASHRAE9012007
+  @@building_type = "Courthouse"
   register_standard ("90.1-2007_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -6300,7 +6300,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012007CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012007Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -6317,7 +6317,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -9596,9 +9596,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012010 CourtHouse.
-  class ASHRAE9012010CourtHouse < ASHRAE9012010
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012010 Courthouse.
+  class ASHRAE9012010Courthouse < ASHRAE9012010
+  @@building_type = "Courthouse"
   register_standard ("90.1-2010_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -9613,7 +9613,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012010CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012010Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -9630,7 +9630,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -12909,9 +12909,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012013 CourtHouse.
-  class ASHRAE9012013CourtHouse < ASHRAE9012013
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012013 Courthouse.
+  class ASHRAE9012013Courthouse < ASHRAE9012013
+  @@building_type = "Courthouse"
   register_standard ("90.1-2013_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -12926,7 +12926,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012013CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012013Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -12943,7 +12943,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -16222,9 +16222,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012016 CourtHouse.
-  class ASHRAE9012016CourtHouse < ASHRAE9012016
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012016 Courthouse.
+  class ASHRAE9012016Courthouse < ASHRAE9012016
+  @@building_type = "Courthouse"
   register_standard ("90.1-2016_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -16239,7 +16239,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012016CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012016Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -16256,7 +16256,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -19535,9 +19535,9 @@ end
   end
 end
 
-  # This class represents a prototypical ASHRAE9012019 CourtHouse.
-  class ASHRAE9012019CourtHouse < ASHRAE9012019
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical ASHRAE9012019 Courthouse.
+  class ASHRAE9012019Courthouse < ASHRAE9012019
+  @@building_type = "Courthouse"
   register_standard ("90.1-2019_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -19552,7 +19552,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for ASHRAE9012019CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for ASHRAE9012019Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -19569,7 +19569,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -22848,9 +22848,9 @@ end
   end
 end
 
-  # This class represents a prototypical DOERef1980to2004 CourtHouse.
-  class DOERef1980to2004CourtHouse < DOERef1980to2004
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical DOERef1980to2004 Courthouse.
+  class DOERef1980to2004Courthouse < DOERef1980to2004
+  @@building_type = "Courthouse"
   register_standard ("DOE Ref 1980-2004_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -22865,7 +22865,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for DOERef1980to2004CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for DOERef1980to2004Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -22882,7 +22882,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -26161,9 +26161,9 @@ end
   end
 end
 
-  # This class represents a prototypical DOERefPre1980 CourtHouse.
-  class DOERefPre1980CourtHouse < DOERefPre1980
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical DOERefPre1980 Courthouse.
+  class DOERefPre1980Courthouse < DOERefPre1980
+  @@building_type = "Courthouse"
   register_standard ("DOE Ref Pre-1980_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -26178,7 +26178,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for DOERefPre1980CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for DOERefPre1980Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -26195,7 +26195,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -29474,9 +29474,9 @@ end
   end
 end
 
-  # This class represents a prototypical NRELZNEReady2017 CourtHouse.
-  class NRELZNEReady2017CourtHouse < NRELZNEReady2017
-  @@building_type = "CourtHouse"
+  # This class represents a prototypical NRELZNEReady2017 Courthouse.
+  class NRELZNEReady2017Courthouse < NRELZNEReady2017
+  @@building_type = "Courthouse"
   register_standard ("NREL ZNE Ready 2017_#{@@building_type}")
   attr_accessor :prototype_database
   attr_accessor :prototype_input
@@ -29491,7 +29491,7 @@ end
     @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs',search_criteria: {'template' => @template,'building_type' => @@building_type })
     if @prototype_input.nil?
       OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => @template,'building_type' => @@building_type }}, cannot create model.")
-      raise("Could not find prototype inputs for NRELZNEReady2017CourtHouse, cannot create model.")
+      raise("Could not find prototype inputs for NRELZNEReady2017Courthouse, cannot create model.")
       return false
     end
     @lookup_building_type = self.model_get_lookup_name(@@building_type)
@@ -29508,7 +29508,7 @@ end
   def set_variables()
     # Will be overwritten in class reopen file.
     # add all building methods for now.
-    self.extend(CourtHouse) unless @template == 'NECB 2011'
+    self.extend(Courthouse) unless @template == 'NECB 2011'
   end
   # Returns the mapping between the names of the spaces
   # in the geometry .osm file and the space types
@@ -31981,9 +31981,9 @@ end
 
 end
 
-  # This class represents a prototypical NECB2011 CourtHouse.
-  class NECB2011CourtHouse < NECB2011
-    BUILDING_TYPE = "CourtHouse"
+  # This class represents a prototypical NECB2011 Courthouse.
+  class NECB2011Courthouse < NECB2011
+    BUILDING_TYPE = "Courthouse"
     TEMPLATE =  "NECB2011"
     register_standard ("#{TEMPLATE}_#{BUILDING_TYPE}")
     attr_accessor :prototype_database
@@ -31999,11 +31999,11 @@ end
       @building_type = BUILDING_TYPE
       @template = TEMPLATE
       @instvarbuilding_type = @building_type
-      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2011",'building_type' => "CourtHouse" })
+      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2011",'building_type' => "Courthouse" })
       if @prototype_input.nil?
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2011",'building_type' => "CourtHouse" }}, cannot create model.")
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2011",'building_type' => "Courthouse" }}, cannot create model.")
         #puts JSON.pretty_generate(standards_data['prototype_inputs'])
-        raise("Could not find prototype inputs for NECB2011 CourtHouse, cannot create model.")
+        raise("Could not find prototype inputs for NECB2011 Courthouse, cannot create model.")
         return false
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
@@ -34395,9 +34395,9 @@ end
 
 end
 
-  # This class represents a prototypical NECB2015 CourtHouse.
-  class NECB2015CourtHouse < NECB2015
-    BUILDING_TYPE = "CourtHouse"
+  # This class represents a prototypical NECB2015 Courthouse.
+  class NECB2015Courthouse < NECB2015
+    BUILDING_TYPE = "Courthouse"
     TEMPLATE =  "NECB2015"
     register_standard ("#{TEMPLATE}_#{BUILDING_TYPE}")
     attr_accessor :prototype_database
@@ -34413,11 +34413,11 @@ end
       @building_type = BUILDING_TYPE
       @template = TEMPLATE
       @instvarbuilding_type = @building_type
-      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2015",'building_type' => "CourtHouse" })
+      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2015",'building_type' => "Courthouse" })
       if @prototype_input.nil?
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2015",'building_type' => "CourtHouse" }}, cannot create model.")
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2015",'building_type' => "Courthouse" }}, cannot create model.")
         #puts JSON.pretty_generate(standards_data['prototype_inputs'])
-        raise("Could not find prototype inputs for NECB2015 CourtHouse, cannot create model.")
+        raise("Could not find prototype inputs for NECB2015 Courthouse, cannot create model.")
         return false
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)
@@ -36809,9 +36809,9 @@ end
 
 end
 
-  # This class represents a prototypical NECB2017 CourtHouse.
-  class NECB2017CourtHouse < NECB2017
-    BUILDING_TYPE = "CourtHouse"
+  # This class represents a prototypical NECB2017 Courthouse.
+  class NECB2017Courthouse < NECB2017
+    BUILDING_TYPE = "Courthouse"
     TEMPLATE =  "NECB2017"
     register_standard ("#{TEMPLATE}_#{BUILDING_TYPE}")
     attr_accessor :prototype_database
@@ -36827,11 +36827,11 @@ end
       @building_type = BUILDING_TYPE
       @template = TEMPLATE
       @instvarbuilding_type = @building_type
-      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2017",'building_type' => "CourtHouse" })
+      @prototype_input = self.standards_lookup_table_first(table_name: 'prototype_inputs', search_criteria: {'template' => "NECB2017",'building_type' => "Courthouse" })
       if @prototype_input.nil?
-        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2017",'building_type' => "CourtHouse" }}, cannot create model.")
+        OpenStudio.logFree(OpenStudio::Error, 'openstudio.standards.Model', "Could not find prototype inputs for #{{'template' => "NECB2017",'building_type' => "Courthouse" }}, cannot create model.")
         #puts JSON.pretty_generate(standards_data['prototype_inputs'])
-        raise("Could not find prototype inputs for NECB2017 CourtHouse, cannot create model.")
+        raise("Could not find prototype inputs for NECB2017 Courthouse, cannot create model.")
         return false
       end
       @lookup_building_type = self.model_get_lookup_name(@building_type)

data/lib/openstudio-standards/prototypes/common/objects/Prototype.hvac_systems.rb

@@ -5931,6 +5931,7 @@ class Standard
         if air_loop_heating_type == 'Water'
           hot_water_loop = model_get_or_add_hot_water_loop(model, main_heat_fuel,
                                                            hot_water_loop_type: hot_water_loop_type)
+          heating_type = 'Water'
         else
           hot_water_loop = nil
         end

data/lib/openstudio-standards/prototypes/common/prototype_metaprogramming.rb

@@ -30,7 +30,7 @@ def create_class_array
                          'LargeOfficeDetailed',
                          'Laboratory',
                          'College',
-                         'CourtHouse',
+                         'Courthouse',
                          'TallBuilding',
                          'SuperTallBuilding']
 

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

@@ -2010,7 +2010,7 @@ class Standard
       if existing_sch.is_initialized
         existing_sch = existing_sch.get
         existing_day_sch_vals = existing_sch.defaultDaySchedule.values
-        if existing_day_sch_vals.size == 1 && existing_day_sch_vals[0] == value
+        if existing_day_sch_vals.size == 1 && (existing_day_sch_vals[0] - value).abs < 1.0e-6
           return existing_sch
         end
       end

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2004/data/ashrae_90_1_2004.spc_typ.json

@@ -4148,7 +4148,7 @@
       "ventilation_standard": "ASHRAE 62.1-2004",
       "ventilation_primary_space_type": "Basement",
       "ventilation_secondary_space_type": "For Hospital",
-      "ventilation_per_area": 0.049,
+      "ventilation_per_area": 0.05,
       "ventilation_per_person": null,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -6782,9 +6782,9 @@
       "occupancy_activity_schedule": "HotelLarge ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
-      "ventilation_per_area": 0.06,
+      "ventilation_primary_space_type": "Public Spaces",
+      "ventilation_secondary_space_type": "Corridors and utilities",
+      "ventilation_per_area": 0.05,
       "ventilation_per_person": null,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -8012,11 +8012,11 @@
       "occupancy_schedule": "HotelLarge BLDG_OCC_SCH",
       "occupancy_activity_schedule": "HotelLarge ACTIVITY_SCH",
       "is_residential": null,
-      "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "Retail",
-      "ventilation_secondary_space_type": "General Sales",
-      "ventilation_per_area": 0.12,
-      "ventilation_per_person": 7.5,
+      "ventilation_standard": "ASHRAE 62.1-1999",
+      "ventilation_primary_space_type": "Retail Stores, Sales Floors, and Show Room Floors",
+      "ventilation_secondary_space_type": "Basement and street",
+      "ventilation_per_area": 0.3,
+      "ventilation_per_person": 0.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.112,
@@ -16352,7 +16352,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Classroom",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -16440,7 +16440,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Classroom",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -16792,7 +16792,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Libraries",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -18024,7 +18024,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Classroom",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -18112,7 +18112,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Classroom",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -18464,7 +18464,7 @@
       "ventilation_primary_space_type": "Education",
       "ventilation_secondary_space_type": "Libraries",
       "ventilation_per_area": 0.0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,
@@ -18549,10 +18549,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-1999",
-      "ventilation_primary_space_type": "Education",
-      "ventilation_secondary_space_type": "Corridors",
-      "ventilation_per_area": 0.1,
-      "ventilation_per_person": 0.0,
+      "ventilation_primary_space_type": "Offices",
+      "ventilation_secondary_space_type": "Reception Areas",
+      "ventilation_per_area": null,
+      "ventilation_per_person": 15.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0595,

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2007/data/ashrae_90_1_2007.spc_typ.json

@@ -13291,10 +13291,10 @@
       "occupancy_schedule": "OfficeSmall BLDG_OCC_SCH",
       "occupancy_activity_schedule": "OfficeSmall ACTIVITY_SCH",
       "is_residential": null,
-      "ventilation_standard": "ASHRAE 62.1-1999",
+      "ventilation_standard": "ASHRAE 62.1-2004",
       "ventilation_primary_space_type": "Office Buildings",
       "ventilation_secondary_space_type": "Whole Building",
-      "ventilation_per_area": 0.1,
+      "ventilation_per_area": 0.085,
       "ventilation_per_person": null,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -18484,10 +18484,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2004",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
+      "ventilation_primary_space_type": "Office",
+      "ventilation_secondary_space_type": "Buildings Main entry lobbies",
       "ventilation_per_area": 0.06,
-      "ventilation_per_person": null,
+      "ventilation_per_person": 5.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0446,

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/data/ashrae_90_1_2010.spc_typ.json

@@ -18659,10 +18659,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
+      "ventilation_primary_space_type": "Office",
+      "ventilation_secondary_space_type": "Buildings Main entry lobbies",
       "ventilation_per_area": 0.06,
-      "ventilation_per_person": null,
+      "ventilation_per_person": 5.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0446,

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2013/data/ashrae_90_1_2013.spc_typ.json

@@ -5201,10 +5201,10 @@
       "occupancy_schedule": "Hospital BLDG_OCC_EXTD_SCH",
       "occupancy_activity_schedule": "Hospital ACTIVITY_SCH",
       "is_residential": null,
-      "ventilation_standard": "ASHRAE 62.1-2007",
+      "ventilation_standard": "ASHRAE 62.1-2010",
       "ventilation_primary_space_type": "Food and Beverage Service",
-      "ventilation_secondary_space_type": "Cafeteria/fast food dining",
-      "ventilation_per_area": 0.18,
+      "ventilation_secondary_space_type": "Kitchen (cooking)",
+      "ventilation_per_area": 0.12,
       "ventilation_per_person": 7.5,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -18955,10 +18955,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
+      "ventilation_primary_space_type": "Office",
+      "ventilation_secondary_space_type": "Buildings Main entry lobbies",
       "ventilation_per_area": 0.06,
-      "ventilation_per_person": null,
+      "ventilation_per_person": 5.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0446,

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2016/data/ashrae_90_1_2016.spc_typ.json

@@ -5201,10 +5201,10 @@
       "occupancy_schedule": "Hospital BLDG_OCC_EXTD_SCH",
       "occupancy_activity_schedule": "Hospital ACTIVITY_SCH",
       "is_residential": null,
-      "ventilation_standard": "ASHRAE 62.1-2007",
+      "ventilation_standard": "ASHRAE 62.1-2013",
       "ventilation_primary_space_type": "Food and Beverage Service",
-      "ventilation_secondary_space_type": "Cafeteria/fast food dining",
-      "ventilation_per_area": 0.18,
+      "ventilation_secondary_space_type": "Kitchen (cooking)",
+      "ventilation_per_area": 0.12,
       "ventilation_per_person": 7.5,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -18925,10 +18925,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
+      "ventilation_primary_space_type": "Office",
+      "ventilation_secondary_space_type": "Buildings Main entry lobbies",
       "ventilation_per_area": 0.06,
-      "ventilation_per_person": null,
+      "ventilation_per_person": 5.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0446,

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2019/data/ashrae_90_1_2019.spc_typ.json

@@ -5201,10 +5201,10 @@
       "occupancy_schedule": "Hospital BLDG_OCC_EXTD_SCH",
       "occupancy_activity_schedule": "Hospital ACTIVITY_SCH",
       "is_residential": null,
-      "ventilation_standard": "ASHRAE 62.1-2007",
+      "ventilation_standard": "ASHRAE 62.1-2016",
       "ventilation_primary_space_type": "Food and Beverage Service",
-      "ventilation_secondary_space_type": "Cafeteria/fast food dining",
-      "ventilation_per_area": 0.18,
+      "ventilation_secondary_space_type": "Kitchen (cooking)",
+      "ventilation_per_area": 0.12,
       "ventilation_per_person": 7.5,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
@@ -18925,10 +18925,10 @@
       "occupancy_activity_schedule": "SchoolSecondary ACTIVITY_SCH",
       "is_residential": null,
       "ventilation_standard": "ASHRAE 62.1-2007",
-      "ventilation_primary_space_type": "General",
-      "ventilation_secondary_space_type": "Corridors",
+      "ventilation_primary_space_type": "Office",
+      "ventilation_secondary_space_type": "Buildings Main entry lobbies",
       "ventilation_per_area": 0.06,
-      "ventilation_per_person": null,
+      "ventilation_per_person": 5.0,
       "ventilation_air_changes": null,
       "minimum_total_air_changes": null,
       "infiltration_per_exterior_area": 0.0446,

data/lib/openstudio-standards/version.rb

@@ -13,5 +13,5 @@ module OpenstudioStandards
     end
     return 'git-not-found-on-this-system'
   end
-  VERSION = '0.2.16.rc2'.freeze
+  VERSION = '0.2.16'.freeze
 end