openstudio-standards 0.2.12.rc4 → 0.2.13.rc3

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

@@ -7356,6 +7356,93 @@
       "automatic_continuous_daylight_dimming_in_secondary_sidelighted_areas": null,
       "automatic_continuous_daylight_dimming_in_daylighted_areas_under_skylights": null
     },
+    {
+      "template": "90.1-2007",
+      "building_type": "LargeHotel",
+      "space_type": "GuestRoom8",
+      "lighting_standard": "ASHRAE 90.1-2007",
+      "lighting_primary_space_type": "Hotel/Motel",
+      "lighting_secondary_space_type": "Guest Rooms",
+      "lighting_per_area": 1.1,
+      "rcr_threshold": null,
+      "lighting_per_person": null,
+      "additional_lighting_per_area": null,
+      "lighting_fraction_to_return_air": 0.0,
+      "lighting_fraction_radiant": 0.7,
+      "lighting_fraction_visible": 0.2,
+      "lighting_fraction_replaceable": 1.0,
+      "lpd_fraction_linear_fluorescent": 1.0,
+      "lpd_fraction_compact_fluorescent": null,
+      "lpd_fraction_high_bay": null,
+      "lpd_fraction_specialty_lighting": null,
+      "lpd_fraction_exit_lighting": null,
+      "lighting_schedule": "HotelLarge BLDG_LIGHT_GUESTROOM_SCH",
+      "compact_fluorescent_lighting_schedule": null,
+      "high_bay_lighting_schedule": null,
+      "specialty_lighting_schedule": null,
+      "exit_lighting_schedule": null,
+      "target_illuminance_setpoint": null,
+      "psa_nongeometry_fraction": null,
+      "ssa_nongeometry_fraction": null,
+      "notes": null,
+      "gas_equipment_per_area": null,
+      "gas_equipment_fraction_latent": null,
+      "gas_equipment_fraction_radiant": null,
+      "gas_equipment_fraction_lost": null,
+      "gas_equipment_schedule": null,
+      "electric_equipment_per_area": 0.977,
+      "electric_equipment_fraction_latent": 0.0,
+      "electric_equipment_fraction_radiant": 0.5,
+      "electric_equipment_fraction_lost": 0.0,
+      "electric_equipment_schedule": "HotelLarge GuestRoom_Eqp_Sch_Base",
+      "additional_electric_equipment_schedule": null,
+      "additional_gas_equipment_schedule": null,
+      "ventilation_standard": "ASHRAE 62.1-2007",
+      "ventilation_primary_space_type": "Hotels, Motels, Resorts, Dormitories",
+      "ventilation_secondary_space_type": "Bedroom/living Room",
+      "ventilation_per_area": 0.06,
+      "ventilation_per_person": 5.0,
+      "ventilation_air_changes": null,
+      "minimum_total_air_changes": null,
+      "occupancy_per_area": 5.68,
+      "occupancy_schedule": "Always Off",
+      "occupancy_activity_schedule": "HotelLarge ACTIVITY_SCH",
+      "is_residential": "Yes",
+      "infiltration_per_exterior_area": 0.112,
+      "infiltration_per_exterior_wall_area": null,
+      "infiltration_air_changes": null,
+      "infiltration_schedule": "HotelLarge INFIL_QUARTER_ON_SCH",
+      "infiltration_schedule_perimeter": null,
+      "heating_setpoint_schedule": "HotelLarge VAC_OccGuestRoom_HtgSP_Sch",
+      "cooling_setpoint_schedule": "HotelLarge VAC_OccGuestRoom_ClgSP_Sch",
+      "service_water_heating_peak_flow_rate": 1.25,
+      "service_water_heating_area": 264.0,
+      "service_water_heating_peak_flow_per_area": 0.004734848485,
+      "service_water_heating_system_type": "Shared",
+      "booster_water_heater_fraction": null,
+      "service_water_heating_target_temperature": 140.0,
+      "booster_water_heating_target_temperature": null,
+      "service_water_heating_fraction_sensible": 0.2,
+      "service_water_heating_fraction_latent": 0.05,
+      "service_water_heating_schedule": "HotelLarge GuestRoom_SWH_Sch",
+      "exhaust_per_area": null,
+      "exhaust_fan_efficiency": null,
+      "exhaust_fan_power": null,
+      "exhaust_fan_pressure_rise": null,
+      "exhaust_fan_maximum_flow_rate": null,
+      "exhaust_availability_schedule": null,
+      "exhaust_flow_fraction_schedule": null,
+      "balanced_exhaust_fraction_schedule": null,
+      "manual_continuous_dimming": null,
+      "programmable_multilevel_dimming": null,
+      "multilevel_occupancy_sensors": null,
+      "occupancy_sensors": null,
+      "occupancy_sensors_with_personal_continuous_dimming": null,
+      "automatic_multilevel_switching_in_primary_sidelighted_areas": null,
+      "automatic_continuous_daylight_dimming_in_primary_sidelighted_areas": null,
+      "automatic_continuous_daylight_dimming_in_secondary_sidelighted_areas": null,
+      "automatic_continuous_daylight_dimming_in_daylighted_areas_under_skylights": null
+    },
     {
       "template": "90.1-2007",
       "building_type": "LargeHotel",
@@ -13079,7 +13166,7 @@
       "template": "90.1-2007",
       "building_type": "Office",
       "space_type": "WholeBuilding - Sm Office",
-      "lighting_standard": "ASHRAE 90.1-2004",
+      "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Whole Building",
       "lighting_secondary_space_type": "Office",
       "lighting_per_area": 1.0,
@@ -18975,7 +19062,7 @@
       "template": "90.1-2007",
       "building_type": "SmallHotel",
       "space_type": "Elec/MechRoom",
-      "lighting_standard": "DOE Ref 1980-2004",
+      "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "SmallHotel",
       "lighting_secondary_space_type": "Elec/MechRoom",
       "lighting_per_area": 0.0,
@@ -19063,7 +19150,7 @@
       "template": "90.1-2007",
       "building_type": "SmallHotel",
       "space_type": "ElevatorCore",
-      "lighting_standard": "DOE Ref 1980-2004",
+      "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "SmallHotel",
       "lighting_secondary_space_type": "ElevatorCore",
       "lighting_per_area": 0.0,
@@ -19151,7 +19238,7 @@
       "template": "90.1-2007",
       "building_type": "SmallHotel",
       "space_type": "ElevatorCore4",
-      "lighting_standard": "DOE Ref 1980-2004",
+      "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "SmallHotel",
       "lighting_secondary_space_type": "ElevatorCore",
       "lighting_per_area": 0.0,
@@ -20741,7 +20828,7 @@
       "lighting_per_area": 1.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
-      "additional_lighting_per_area": 0.72,
+      "additional_lighting_per_area": 1.0,
       "lighting_fraction_to_return_air": 0.0,
       "lighting_fraction_radiant": 0.7,
       "lighting_fraction_visible": 0.2,
@@ -20829,7 +20916,7 @@
       "lighting_per_area": 1.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
-      "additional_lighting_per_area": 0.5,
+      "additional_lighting_per_area": 0.959,
       "lighting_fraction_to_return_air": 0.0,
       "lighting_fraction_radiant": 0.7,
       "lighting_fraction_visible": 0.2,
@@ -20917,7 +21004,7 @@
       "lighting_per_area": 1.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
-      "additional_lighting_per_area": 0.07,
+      "additional_lighting_per_area": 0.0,
       "lighting_fraction_to_return_air": 0.0,
       "lighting_fraction_radiant": 0.7,
       "lighting_fraction_visible": 0.2,
@@ -21090,7 +21177,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Corridor",
-      "lighting_per_area": 0.46,
+      "lighting_per_area": 0.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21266,7 +21353,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Dining",
-      "lighting_per_area": 0.93,
+      "lighting_per_area": 0.9,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21354,7 +21441,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "DryStorage",
-      "lighting_per_area": 0.83,
+      "lighting_per_area": 0.8,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21442,7 +21529,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Elec/Mech",
-      "lighting_per_area": 1.48,
+      "lighting_per_area": 1.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21706,7 +21793,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Sales/Produce",
-      "lighting_per_area": 3.3,
+      "lighting_per_area": 1.7,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21794,7 +21881,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Restroom",
-      "lighting_per_area": 0.92,
+      "lighting_per_area": 0.9,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21882,7 +21969,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Sales/Produce",
-      "lighting_per_area": 3.3,
+      "lighting_per_area": 1.7,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -21970,7 +22057,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Supermarket",
       "lighting_secondary_space_type": "Vestibule",
-      "lighting_per_area": 0.46,
+      "lighting_per_area": 0.5,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -22058,7 +22145,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Warehouse",
       "lighting_secondary_space_type": "Medium/Bulky Material Storage",
-      "lighting_per_area": 0.8,
+      "lighting_per_area": 0.9,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
@@ -22146,7 +22233,7 @@
       "lighting_standard": "ASHRAE 90.1-2007",
       "lighting_primary_space_type": "Warehouse",
       "lighting_secondary_space_type": "Fine Material Storage",
-      "lighting_per_area": 0.8,
+      "lighting_per_area": 1.4,
       "rcr_threshold": null,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,

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

@@ -269,11 +269,11 @@
       "ptac_eer_coefficient_1": null,
       "ptac_eer_coefficient_2": null,
       "minimum_scop": 2.2,
-      "cool_cap_ft": "CoilClgDXQRatio_fTwbToadbSI",
-      "cool_cap_fflow": "CoilClgDXDblQRatio_fCFMRatio",
-      "cool_eir_ft": "CoilClgDXEIRRatio_fTwbToadbSI",
-      "cool_eir_fflow": "CoilClgDXDblEIRRatio_fCFMRatio",
-      "cool_plf_fplr": "CoilClgDXEIRRatio_fQFrac",
+      "cool_cap_ft": "PSZ-Fine Storage DX Coil Cap-FT",
+      "cool_cap_fflow": "DX Coil Cap-FF",
+      "cool_eir_ft": "PSZ-AC DX Coil EIR-FT",
+      "cool_eir_fflow": "Split DX Coil EIR-FF",
+      "cool_plf_fplr": "HPACCOOLPLFFPLR",
       "notes": "2007 not specified, follow ASHRAE 90.1-2013 Table 6.8.1-11. capacity here is sensible only. SCOP for downflow units"
     },
     {
@@ -292,11 +292,11 @@
       "ptac_eer_coefficient_1": null,
       "ptac_eer_coefficient_2": null,
       "minimum_scop": 2.1,
-      "cool_cap_ft": "CoilClgDXQRatio_fTwbToadbSI",
-      "cool_cap_fflow": "CoilClgDXDblQRatio_fCFMRatio",
-      "cool_eir_ft": "CoilClgDXEIRRatio_fTwbToadbSI",
-      "cool_eir_fflow": "CoilClgDXDblEIRRatio_fCFMRatio",
-      "cool_plf_fplr": "CoilClgDXEIRRatio_fQFrac",
+      "cool_cap_ft": "PSZ-Fine Storage DX Coil Cap-FT",
+      "cool_cap_fflow": "DX Coil Cap-FF",
+      "cool_eir_ft": "PSZ-AC DX Coil EIR-FT",
+      "cool_eir_fflow": "Split DX Coil EIR-FF",
+      "cool_plf_fplr": "HPACCOOLPLFFPLR",
       "notes": "2007 not specified, follow ASHRAE 90.1-2013 Table 6.8.1-11. capacity here is sensible only. SCOP for downflow units"
     },
     {
@@ -315,11 +315,11 @@
       "ptac_eer_coefficient_1": null,
       "ptac_eer_coefficient_2": null,
       "minimum_scop": 1.9,
-      "cool_cap_ft": "CoilClgDXQRatio_fTwbToadbSI",
-      "cool_cap_fflow": "CoilClgDXDblQRatio_fCFMRatio",
-      "cool_eir_ft": "CoilClgDXEIRRatio_fTwbToadbSI",
-      "cool_eir_fflow": "CoilClgDXDblEIRRatio_fCFMRatio",
-      "cool_plf_fplr": "CoilClgDXEIRRatio_fQFrac",
+      "cool_cap_ft": "PSZ-Fine Storage DX Coil Cap-FT",
+      "cool_cap_fflow": "DX Coil Cap-FF",
+      "cool_eir_ft": "PSZ-AC DX Coil EIR-FT",
+      "cool_eir_fflow": "Split DX Coil EIR-FF",
+      "cool_plf_fplr": "HPACCOOLPLFFPLR",
       "notes": "2007 not specified, follow ASHRAE 90.1-2013 Table 6.8.1-11. capacity here is sensible only. SCOP for downflow units"
     },
     {

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.AirLoopHVAC.rb

@@ -13,7 +13,7 @@ class ASHRAE9012010 < ASHRAE901
     # First time adjustment:
     # Only applies to multi-zone vav systems
     # exclusion: for Outpatient: (1) both AHU1 and AHU2 in 'DOE Ref Pre-1980' and 'DOE Ref 1980-2004'
-    # (2) AHU1 in 2004-2013
+    # (2) AHU1 in 2004-2019
     # TODO refactor: move building-type-specific code to Prototype classes
     if air_loop_hvac_multizone_vav_system?(air_loop_hvac) && !(air_loop_hvac.name.to_s.include? 'Outpatient F1')
       air_loop_hvac_adjust_minimum_vav_damper_positions(air_loop_hvac)
@@ -32,11 +32,9 @@ class ASHRAE9012010 < ASHRAE901
 
     # Get the OA system and OA controller
     oa_sys = air_loop_hvac.airLoopHVACOutdoorAirSystem
-    if oa_sys.is_initialized
-      oa_sys = oa_sys.get
-    else
-      return [nil, nil, nil] # No OA system
-    end
+    return [nil, nil, nil] unless oa_sys.is_initialized # No OA system
+
+    oa_sys = oa_sys.get
     oa_control = oa_sys.getControllerOutdoorAir
     economizer_type = oa_control.getEconomizerControlType
 
@@ -45,8 +43,8 @@ class ASHRAE9012010 < ASHRAE901
       return [nil, nil, nil]
     when 'FixedDryBulb'
       search_criteria = {
-          'template' => template,
-          'climate_zone' => climate_zone
+        'template' => template,
+        'climate_zone' => climate_zone
       }
       econ_limits = model_find_object(standards_data['economizers'], search_criteria)
       drybulb_limit_f = econ_limits['fixed_dry_bulb_high_limit_shutoff_temp']
@@ -102,7 +100,8 @@ class ASHRAE9012010 < ASHRAE901
     # Determine the prohibited types
     prohibited_types = []
     case climate_zone
-    when 'ASHRAE 169-2006-1B',
+    when 'ASHRAE 169-2006-0B',
+         'ASHRAE 169-2006-1B',
          'ASHRAE 169-2006-2B',
          'ASHRAE 169-2006-3B',
          'ASHRAE 169-2006-3C',
@@ -114,6 +113,7 @@ class ASHRAE9012010 < ASHRAE901
          'ASHRAE 169-2006-7B',
          'ASHRAE 169-2006-8A',
          'ASHRAE 169-2006-8B',
+         'ASHRAE 169-2013-0B',
          'ASHRAE 169-2013-1B',
          'ASHRAE 169-2013-2B',
          'ASHRAE 169-2013-3B',
@@ -127,10 +127,12 @@ class ASHRAE9012010 < ASHRAE901
          'ASHRAE 169-2013-8A',
          'ASHRAE 169-2013-8B'
       prohibited_types = ['FixedEnthalpy']
-    when 'ASHRAE 169-2006-1A',
+    when 'ASHRAE 169-2006-0A',
+         'ASHRAE 169-2006-1A',
          'ASHRAE 169-2006-2A',
          'ASHRAE 169-2006-3A',
          'ASHRAE 169-2006-4A',
+         'ASHRAE 169-2013-0A',
          'ASHRAE 169-2013-1A',
          'ASHRAE 169-2013-2A',
          'ASHRAE 169-2013-3A',
@@ -154,6 +156,7 @@ class ASHRAE9012010 < ASHRAE901
 
   # Determine if multizone vav optimization is required.
   #
+  # @code_sections [90.1-2010_6.5.3.3]
   # @param (see #economizer_required?)
   # @return [Bool] Returns true if required, false if not.
   # @todo Add exception logic for
@@ -175,6 +178,7 @@ class ASHRAE9012010 < ASHRAE901
     end
 
     # Not required for systems that require an ERV
+    # Exception 2 to Section 6.5.3.3
     if air_loop_hvac_energy_recovery?(air_loop_hvac)
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: multizone vav optimization is not required because the system has Energy Recovery.")
       return multizone_opt_required
@@ -255,14 +259,18 @@ class ASHRAE9012010 < ASHRAE901
   # @return [Array<Double>] [minimum_oa_flow_cfm, maximum_stories]
   def air_loop_hvac_motorized_oa_damper_limits(air_loop_hvac, climate_zone)
     case climate_zone
-    when 'ASHRAE 169-2006-1A',
+    when 'ASHRAE 169-2006-0A',
+         'ASHRAE 169-2006-1A',
+         'ASHRAE 169-2006-0B',
          'ASHRAE 169-2006-1B',
          'ASHRAE 169-2006-2A',
          'ASHRAE 169-2006-2B',
          'ASHRAE 169-2006-3A',
          'ASHRAE 169-2006-3B',
          'ASHRAE 169-2006-3C',
+         'ASHRAE 169-2013-0A',
          'ASHRAE 169-2013-1A',
+         'ASHRAE 169-2013-0B',
          'ASHRAE 169-2013-1B',
          'ASHRAE 169-2013-2A',
          'ASHRAE 169-2013-2B',
@@ -312,15 +320,18 @@ class ASHRAE9012010 < ASHRAE901
     end
 
     case climate_zone
-    when 'ASHRAE 169-2006-1A',
+    when 'ASHRAE 169-2006-0A',
+         'ASHRAE 169-2006-1A',
          'ASHRAE 169-2006-2A',
          'ASHRAE 169-2006-3A',
+         'ASHRAE 169-2013-0A',
          'ASHRAE 169-2013-1A',
          'ASHRAE 169-2013-2A',
          'ASHRAE 169-2013-3A'
       OpenStudio.logFree(OpenStudio::Info, 'openstudio.standards.AirLoopHVAC', "For #{air_loop_hvac.name}: Supply air temperature reset is not required per 6.5.3.4 Exception 1, the system is located in climate zone #{climate_zone}.")
       return is_sat_reset_required
-    when 'ASHRAE 169-2006-1B',
+    when 'ASHRAE 169-2006-0B',
+         'ASHRAE 169-2006-1B',
          'ASHRAE 169-2006-2B',
          'ASHRAE 169-2006-3B',
          'ASHRAE 169-2006-3C',
@@ -336,6 +347,7 @@ class ASHRAE9012010 < ASHRAE901
          'ASHRAE 169-2006-7B',
          'ASHRAE 169-2006-8A',
          'ASHRAE 169-2006-8B',
+         'ASHRAE 169-2013-0B',
          'ASHRAE 169-2013-1B',
          'ASHRAE 169-2013-2B',
          'ASHRAE 169-2013-3B',
@@ -365,10 +377,15 @@ class ASHRAE9012010 < ASHRAE901
   def air_loop_hvac_energy_recovery_ventilator_flow_limit(air_loop_hvac, climate_zone, pct_oa)
     # Table 6.5.6.1
     search_criteria = {
-        'template' => template,
-        'climate_zone' => climate_zone
+      'template' => template,
+      'climate_zone' => climate_zone
     }
     energy_recovery_limits = model_find_object(standards_data['energy_recovery'], search_criteria)
+    if energy_recovery_limits.nil?
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.ashrae_90_1_2010.AirLoopHVAC', "Cannot find energy recovery limits for template '#{template}', climate zone '#{climate_zone}', assuming no energy recovery required.")
+      return nil
+    end
+
     if pct_oa < 0.1
       erv_cfm = nil
     elsif pct_oa >= 0.1 && pct_oa < 0.2

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/ashrae_90_1_2010.Space.rb

@@ -39,7 +39,7 @@ class ASHRAE9012010 < ASHRAE901
       # Check effective sidelighted aperture
       sidelighted_effective_aperture = space_sidelighting_effective_aperture(space, areas['primary_sidelighted_area'])
       OpenStudio.logFree(OpenStudio::Debug, 'openstudio.model.Space', "sidelighted_effective_aperture_pri = #{sidelighted_effective_aperture}")
-      if sidelighted_effective_aperture < 0.1 and @instvarbuilding_type.nil?
+      if sidelighted_effective_aperture < 0.1 && @instvarbuilding_type.nil?
         OpenStudio.logFree(OpenStudio::Info, 'openstudio.model.Space', "For #{space.name}, primary sidelighting control not required because sidelighted effective aperture less than 0.1 per 9.4.1.4 Exception b.")
         req_pri_ctrl = false
       end

data/lib/openstudio-standards/standards/ashrae_90_1/ashrae_90_1_2010/comstock_ashrae_90_1_2010/data/ashrae_90_1.schedules.json

@@ -341828,11 +341828,24 @@
       "name": "Warehouse BLDG_LIGHT_OFFICE_SCH",
       "category": "Lighting",
       "units": null,
-      "day_types": "Sat|Wkdy",
+      "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Hourly",
+      "type": "Constant",
       "notes": "From DOE Prototype Buildings",
+      "values": [
+        1.0
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Wkdy",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Hourly",
+      "notes": "From DOE Prototype Buildings. Day Types changed from Sat|Wkdy to Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.18,
         0.18,
@@ -341860,19 +341873,6 @@
         0.18
       ]
     },
-    {
-      "name": "Warehouse BLDG_LIGHT_OFFICE_SCH",
-      "category": "Lighting",
-      "units": null,
-      "day_types": "SmrDsn",
-      "start_date": "2014-01-01T00:00:00+00:00",
-      "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
-      "notes": "From DOE Prototype Buildings",
-      "values": [
-        1.0
-      ]
-    },
     {
       "name": "Warehouse BLDG_LIGHT_OFFICE_SCH",
       "category": "Lighting",
@@ -342053,11 +342053,24 @@
       "name": "Warehouse BLDG_LIGHT_STORAGE_SCH",
       "category": "Lighting",
       "units": null,
-      "day_types": "Sat|Wkdy",
+      "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Hourly",
+      "type": "Constant",
       "notes": "From DOE Prototype Buildings",
+      "values": [
+        1.0
+      ]
+    },
+    {
+      "name": "Warehouse BLDG_LIGHT_STORAGE_SCH",
+      "category": "Lighting",
+      "units": null,
+      "day_types": "Wkdy",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Hourly",
+      "notes": "From DOE Prototype Buildings. Day Types changed from Sat|Wkdy to Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.1,
         0.1,
@@ -342085,19 +342098,6 @@
         0.1
       ]
     },
-    {
-      "name": "Warehouse BLDG_LIGHT_STORAGE_SCH",
-      "category": "Lighting",
-      "units": null,
-      "day_types": "SmrDsn",
-      "start_date": "2014-01-01T00:00:00+00:00",
-      "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
-      "notes": "From DOE Prototype Buildings",
-      "values": [
-        1.0
-      ]
-    },
     {
       "name": "Warehouse BLDG_LIGHT_STORAGE_SCH",
       "category": "Lighting",
@@ -342128,11 +342128,11 @@
       "name": "Warehouse BLDG_OCC_SCH",
       "category": "Occupancy",
       "units": null,
-      "day_types": "WntrDsn|SmrDsn|Sat|Wkdy",
+      "day_types": "WntrDsn|SmrDsn|Wkdy",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
-      "notes": "From DOE Prototype Buildings",
+      "notes": "From DOE Prototype Buildings. Day Types changed from WntrDsn|SmrDsn|Sat|Wkdy to WntrDsn|SmrDsn|Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.0,
         0.0,
@@ -342177,7 +342177,7 @@
       "name": "Warehouse Bldg Equip",
       "category": "Equipment",
       "units": null,
-      "day_types": "Mon|Tue|Wed|Thu|Fri|Sat",
+      "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
@@ -342213,11 +342213,11 @@
       "name": "Warehouse Bldg Equip",
       "category": "Equipment",
       "units": null,
-      "day_types": "SmrDsn",
+      "day_types": "Wkdy",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
-      "notes": "From DOE Reference Buildings ",
+      "notes": "From DOE Reference Buildings. Day Types changed from Mon|Tue|Wed|Thu|Fri|Sat to Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.25,
         0.25,
@@ -342249,11 +342249,11 @@
       "name": "Warehouse Bldg Equip",
       "category": "Equipment",
       "units": null,
-      "day_types": "Sun|Hol",
+      "day_types": "Wknd|Hol",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Constant",
-      "notes": "From DOE Reference Buildings ",
+      "notes": "From DOE Reference Buildings. Day Types changed from Sun|Hol to Wknd|Hol based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.0
       ]
@@ -342441,42 +342441,6 @@
         0.0
       ]
     },
-    {
-      "name": "Warehouse Bldg Occ",
-      "category": "Occupancy",
-      "units": null,
-      "day_types": "Sat",
-      "start_date": "2014-01-01T00:00:00+00:00",
-      "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Hourly",
-      "notes": "From DOE Reference Buildings ",
-      "values": [
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.2,
-        0.2,
-        0.2,
-        0.2,
-        0.1,
-        0.1,
-        0.1,
-        0.1,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0,
-        0.0
-      ]
-    },
     {
       "name": "Warehouse Bldg Occ",
       "category": "Occupancy",
@@ -342494,11 +342458,11 @@
       "name": "Warehouse Bldg Occ",
       "category": "Occupancy",
       "units": null,
-      "day_types": "WntrDsn|Sun",
+      "day_types": "WntrDsn|Wknd",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Constant",
-      "notes": "From DOE Reference Buildings ",
+      "notes": "From DOE Reference Buildings. Day Types changed from WntrDsn|Sun to WntrDsn|Wknd based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.0
       ]
@@ -343715,11 +343679,24 @@
       "name": "Warehouse Office_Plug_SCH",
       "category": "Unknown",
       "units": null,
-      "day_types": "Sat|Wkdy",
+      "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Hourly",
+      "type": "Constant",
       "notes": "From DOE Prototype Buildings",
+      "values": [
+        1.0
+      ]
+    },
+    {
+      "name": "Warehouse Office_Plug_SCH",
+      "category": "Unknown",
+      "units": null,
+      "day_types": "Wkdy",
+      "start_date": "2014-01-01T00:00:00+00:00",
+      "end_date": "2014-12-31T00:00:00+00:00",
+      "type": "Hourly",
+      "notes": "From DOE Prototype Buildings. Day Types changed from Sat|Wkdy to Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.25545,
         0.25545,
@@ -343751,50 +343728,50 @@
       "name": "Warehouse Office_Plug_SCH",
       "category": "Unknown",
       "units": null,
-      "day_types": "SmrDsn",
+      "day_types": "WntrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Constant",
       "notes": "From DOE Prototype Buildings",
       "values": [
-        1.0
+        0.0
       ]
     },
     {
-      "name": "Warehouse Office_Plug_SCH",
+      "name": "Warehouse Office_Plug_SCH_2013",
       "category": "Unknown",
       "units": null,
-      "day_types": "WntrDsn",
+      "day_types": "Default",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Constant",
       "notes": "From DOE Prototype Buildings",
       "values": [
-        0.0
+        0.25545
       ]
     },
     {
       "name": "Warehouse Office_Plug_SCH_2013",
       "category": "Unknown",
       "units": null,
-      "day_types": "Default",
+      "day_types": "SmrDsn",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Constant",
       "notes": "From DOE Prototype Buildings",
       "values": [
-        0.25545
+        1.0
       ]
     },
     {
       "name": "Warehouse Office_Plug_SCH_2013",
       "category": "Unknown",
       "units": null,
-      "day_types": "Sat|Wkdy",
+      "day_types": "Wkdy",
       "start_date": "2014-01-01T00:00:00+00:00",
       "end_date": "2014-12-31T00:00:00+00:00",
       "type": "Hourly",
-      "notes": "From DOE Prototype Buildings",
+      "notes": "From DOE Prototype Buildings. Day Types changed from Sat|Wkdy to Wkdy based on EULP Calibration with AMI data from Fort Collins/PGE/Seattle",
       "values": [
         0.2456865339,
         0.2456865339,
@@ -343822,19 +343799,6 @@
         0.2456865339
       ]
     },
-    {
-      "name": "Warehouse Office_Plug_SCH_2013",
-      "category": "Unknown",
-      "units": null,
-      "day_types": "SmrDsn",
-      "start_date": "2014-01-01T00:00:00+00:00",
-      "end_date": "2014-12-31T00:00:00+00:00",
-      "type": "Constant",
-      "notes": "From DOE Prototype Buildings",
-      "values": [
-        1.0
-      ]
-    },
     {
       "name": "Warehouse Office_Plug_SCH_2013",
       "category": "Unknown",