openstudio-extension 0.5.1 → 0.6.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d5fc1ae05ebc04e7ba917e74002f1c9c574fb03354c1dc9a8a12dd5fa1f897
-  data.tar.gz: 876541d14c4ccc7a97eb7a617d40c7dc68f58f1a49959491d51919e8af068f17
+  metadata.gz: 523a398338a5d93b39e33c434d2d23da38bf498a3f49c98fd761782921dc2d8d
+  data.tar.gz: 4f5d6547b2473c213182e17ee1367b97b1c9096bfbf7b887c1fdeaaab39ed311
 SHA512:
-  metadata.gz: d3df31fdd6f8bd2805af4c69effc71f3ebb50c4ea1863f728737140623b42b87ebd5f2a05555b13eb8a0b2237a1eb73b8184723593bd89805a157bed4ec545ff
-  data.tar.gz: 20e1d537b0bd4ac570a6c8e90aa44de68434aaa573b1142fe560b340c9b9d8dca2182cea1c3dc9b6ca42c688afebe25ca3c5f1d2cf9382ed549645aa06a46ce3
+  metadata.gz: f9b8c5aef57f50f23433781f7415287fbbe07558e97a3b897fd0fee2b67fcf826f9b72221db2c05b36b9dddeb912f48db3e175b5219ae1ac366af52ee2dfcb2e
+  data.tar.gz: 93744282520e2245f8ea6d6ff8e10364cbfbe414f0cac8e6c6f039d79db5cf5bfae970ca59efa31ed7cc3007833686438ac73b6936fed97dd222a009bf4b061e

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # OpenStudio Extension Gem
 
+## Version 0.6.0
+
+* Fixed [#150]( https://github.com/NREL/openstudio-extension-gem/pull/150 ), Fixed Outpatient DressingRoom name
+* Adding in new DOE templates `ComStock 90.1-2016` and `ComStock 90.1-2019`
+* Adding in new DOE Building Types `Courthouse` and `College`
+* Upgrade developer dependency to openstudio-standards gem to `~> 0.2.17`
+
 ## Version 0.5.1
 
 * Fix adjancent surface matching 

data/Gemfile

@@ -6,3 +6,5 @@ source 'http://rubygems.org'
 # gem 'openstudio-standards', github: 'NREL/openstudio-standards', branch: 'fix/901_2016_2019_properties' # for os_lib unit tests
 
 gemspec
+
+#gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes'

data/Jenkinsfile

@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
  
-@Library('cbci_shared_libs') _
+@Library('cbci_shared_libs@3.5.0-alpha') _
 
 // Build for PR to develop branch only. 
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set

data/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/README.md

@@ -85,6 +85,9 @@ export RUBYLIB=/Applications/OpenStudio-3.1.0/Ruby
 
 |OpenStudio Extension Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.6.0          | 3.5      | 2.7    |
+| 0.5.1          | 3.4      | 2.7    |
+| 0.5.1          | 3.3      | 2.7    |
 | 0.4.0 - 0.4.4  | 3.2      | 2.7    |
 | 0.3.0 - 0.3.2  | 3.1      | 2.5    |
 | 0.2.0 - 0.2.6  | 3.0      | 2.5    |

data/Rakefile

@@ -1,5 +1,5 @@
 ########################################################################################################################
-#  openstudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+#  openstudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
 #
 #  Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
 #  following conditions are met:

data/doc_templates/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
   # All rights reserved.
   # Redistribution and use in source and binary forms, with or without
   # modification, are permitted provided that the following conditions are met:

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+ * OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
 */

data/doc_templates/copyright_ruby.txt

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/openstudio_module.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/spec.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/spec_helper.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/init_templates/version.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/change_log.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/openstudio_extension_test_measure/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted 
 provided that the following conditions are met:

data/lib/measures/openstudio_extension_test_measure/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/measures/openstudio_extension_test_measure/resources/os_lib_helper_methods.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/check_mech_sys_type.rb

@@ -85,7 +85,7 @@ module OsLib_QAQC
       if use_old_gem_code
         climate_zone = @model.get_building_climate_zone_and_building_type['climate_zone']
       else
-        climate_zone = std.model_get_building_climate_zone_and_building_type(@model)['climate_zone']
+        climate_zone = std.model_get_building_properties(@model)['climate_zone']
       end
 
       if use_old_gem_code

data/lib/openstudio/extension/core/check_part_loads.rb

@@ -286,10 +286,10 @@ module OsLib_QAQC
       # DX Cooling Coils (Single Speed)
       @model.getCoilCoolingDXSingleSpeeds.each do |equip|
         # Get the design coil capacity
-        if equip.ratedTotalCoolingCapacity.is_initialized
-          dsn_pwr = equip.ratedTotalCoolingCapacity.get
-        elsif equip.autosizedRatedTotalCoolingCapacity.is_initialized
-          dsn_pwr = equip.autosizedRatedTotalCoolingCapacity.get
+        if equip.grossRatedTotalCoolingCapacity.is_initialized
+          dsn_pwr = equip.grossRatedTotalCoolingCapacity.get
+        elsif equip.autosizedGrossRatedTotalCoolingCapacity.is_initialized
+          dsn_pwr = equip.autosizedGrossRatedTotalCoolingCapacity.get
         else
           check_elems << OpenStudio::Attribute.new('flag', "Could not determine capacity for #{equip.name}, cannot check part load ratios.")
           next

data/lib/openstudio/extension/core/os_lib_hvac.rb

@@ -821,7 +821,7 @@ module OsLib_HVAC
         # create air loop fan
         if options['primaryHVAC']['fan'] == 'Variable'
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) # DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) # DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule)
           fan.setFanEfficiency(0.69)
@@ -832,7 +832,7 @@ module OsLib_HVAC
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule)
           fan.setFanEfficiency(0.6)
@@ -1084,13 +1084,13 @@ module OsLib_HVAC
         sizing_system.setTypeofLoadtoSizeOn('Sensible') # PSZ
         sizing_system.setAllOutdoorAirinCooling(false) # PSZ
         sizing_system.setAllOutdoorAirinHeating(false) # PSZ
-        sizing_system.setMinimumSystemAirFlowRatio(1.0) # Constant volume fan
+        sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # Constant volume fan
         air_loop_comps = []
         # set availability schedule (HVAC operation schedule)
         airloop_secondary.setAvailabilitySchedule(options['hvac_schedule'])
         if options['secondaryHVAC']['fan'] == 'Variable'
           # create variable speed fan and set system sizing accordingly
-          sizing_system.setMinimumSystemAirFlowRatio(0.3) # DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(0.3) # DCV
           # variable speed fan
           fan = OpenStudio::Model::FanVariableVolume.new(model, model.alwaysOnDiscreteSchedule)
           fan.setFanEfficiency(0.69)
@@ -1101,7 +1101,7 @@ module OsLib_HVAC
           fan.setMotorInAirstreamFraction(1.0)
           air_loop_comps << fan
         else
-          sizing_system.setMinimumSystemAirFlowRatio(1.0) # No DCV
+          sizing_system.setCentralHeatingMaximumSystemAirFlowRatio(1.0) # No DCV
           # constant speed fan
           fan = OpenStudio::Model::FanConstantVolume.new(model, model.alwaysOnDiscreteSchedule)
           fan.setFanEfficiency(0.6)
@@ -1352,36 +1352,58 @@ module OsLib_HVAC
           # create cooling coil and connect to heat pump loop
           cooling_coil = OpenStudio::Model::CoilCoolingWaterToAirHeatPumpEquationFit.new(model)
           cooling_coil.setRatedCoolingCoefficientofPerformance(6.45)
-          cooling_coil.setTotalCoolingCapacityCoefficient1(-9.149069561)
-          cooling_coil.setTotalCoolingCapacityCoefficient2(10.87814026)
-          cooling_coil.setTotalCoolingCapacityCoefficient3(-1.718780157)
-          cooling_coil.setTotalCoolingCapacityCoefficient4(0.746414818)
-          cooling_coil.setTotalCoolingCapacityCoefficient5(0.0)
-          cooling_coil.setSensibleCoolingCapacityCoefficient1(-5.462690012)
-          cooling_coil.setSensibleCoolingCapacityCoefficient2(17.95968138)
-          cooling_coil.setSensibleCoolingCapacityCoefficient3(-11.87818402)
-          cooling_coil.setSensibleCoolingCapacityCoefficient4(-0.980163419)
-          cooling_coil.setSensibleCoolingCapacityCoefficient5(0.767285761)
-          cooling_coil.setSensibleCoolingCapacityCoefficient6(0.0)
-          cooling_coil.setCoolingPowerConsumptionCoefficient1(-3.205409884)
-          cooling_coil.setCoolingPowerConsumptionCoefficient2(-0.976409399)
-          cooling_coil.setCoolingPowerConsumptionCoefficient3(3.97892546)
-          cooling_coil.setCoolingPowerConsumptionCoefficient4(0.938181818)
-          cooling_coil.setCoolingPowerConsumptionCoefficient5(0.0)
+
+          curve = OpenStudio::Model::CurveQuadLinear.new(model)
+          curve.setName("#{cooling_coil.name}_tot_clg_cap_curve")
+          curve.setCoefficient1Constant(-9.149069561)
+          curve.setCoefficient2w(10.87814026)
+          curve.setCoefficient3x(-1.718780157)
+          curve.setCoefficient4y(0.746414818)
+          curve.setCoefficient5z(0.0)
+          cooling_coil.setTotalCoolingCapacityCurve(curve)
+
+          curve = OpenStudio::Model::CurveQuintLinear.new(model)
+          curve.setName("#{cooling_coil.name}_sens_clg_cap_curve")
+          curve.setCoefficient1Constant(-5.462690012)
+          curve.setCoefficient2v(17.95968138)
+          curve.setCoefficient3w(-11.87818402)
+          curve.setCoefficient4x(-0.980163419)
+          curve.setCoefficient5y(0.767285761)
+          curve.setCoefficient6z(0.0)
+          cooling_coil.setSensibleCoolingCapacityCurve(curve)
+
+          curve = OpenStudio::Model::CurveQuadLinear.new(model)
+          curve.setName("#{cooling_coil.name}_clg_pwr_consu_curve")
+          curve.setCoefficient1Constant(-3.205409884)
+          curve.setCoefficient2w(-0.976409399)
+          curve.setCoefficient3x(3.97892546)
+          curve.setCoefficient4y(0.938181818)
+          curve.setCoefficient5z(0.0)
+          cooling_coil.setCoolingPowerConsumptionCurve(curve)
+
           options['heat_pump_loop'].addDemandBranchForComponent(cooling_coil)
           # create heating coil and connect to heat pump loop
           heating_coil = OpenStudio::Model::CoilHeatingWaterToAirHeatPumpEquationFit.new(model)
           heating_coil.setRatedHeatingCoefficientofPerformance(4.0)
-          heating_coil.setHeatingCapacityCoefficient1(-1.361311959)
-          heating_coil.setHeatingCapacityCoefficient2(-2.471798046)
-          heating_coil.setHeatingCapacityCoefficient3(4.173164514)
-          heating_coil.setHeatingCapacityCoefficient4(0.640757401)
-          heating_coil.setHeatingCapacityCoefficient5(0.0)
-          heating_coil.setHeatingPowerConsumptionCoefficient1(-2.176941116)
-          heating_coil.setHeatingPowerConsumptionCoefficient2(0.832114286)
-          heating_coil.setHeatingPowerConsumptionCoefficient3(1.570743399)
-          heating_coil.setHeatingPowerConsumptionCoefficient4(0.690793651)
-          heating_coil.setHeatingPowerConsumptionCoefficient5(0.0)
+
+          curve = OpenStudio::Model::CurveQuadLinear.new(model)
+          curve.setName("#{heating_coil.name}_htg_cap_curve")
+          curve.setCoefficient1Constant(-1.361311959)
+          curve.setCoefficient2w(-2.471798046)
+          curve.setCoefficient3x(4.173164514)
+          curve.setCoefficient4y(0.640757401)
+          curve.setCoefficient5z(0.0)
+          heating_coil.setHeatingCapacityCurve(curve)
+
+          curve = OpenStudio::Model::CurveQuadLinear.new(model)
+          curve.setName("#{heating_coil.name}_htg_pwr_consu_curve")
+          curve.setCoefficient1Constant(-2.176941116)
+          curve.setCoefficient2w(0.832114286)
+          curve.setCoefficient3x(1.570743399)
+          curve.setCoefficient4y(0.690793651)
+          curve.setCoefficient5z(0.0)
+          heating_coil.setHeatingPowerConsumptionCurve(curve)
+
           options['heat_pump_loop'].addDemandBranchForComponent(heating_coil)
           # create supplemental heating coil
           supplemental_heating_coil = OpenStudio::Model::CoilHeatingElectric.new(model, model.alwaysOnDiscreteSchedule)

data/lib/openstudio/extension/core/os_lib_model_generation.rb

@@ -89,6 +89,8 @@ module OsLib_ModelGeneration
     array << 'LargeDataCenterHighITE'
     array << 'SmallDataCenterLowITE'
     array << 'SmallDataCenterHighITE'
+    array << 'Courthouse'
+    array << 'College'
 
     return array
   end
@@ -169,6 +171,8 @@ module OsLib_ModelGeneration
     array << 'ComStock 90.1-2007'
     array << 'ComStock 90.1-2010'
     array << 'ComStock 90.1-2013'
+    array << 'ComStock 90.1-2016'
+    array << 'ComStock 90.1-2019'
     if extended
       # array << '189.1-2009' # if turn this on need to update space_type_array for RetailStripmall
       array << 'NREL ZNE Ready 2017'
@@ -375,6 +379,10 @@ module OsLib_ModelGeneration
     hash['SmallDataCenterLowITE'] = { aspect_ratio: 1.5, wwr: 0.0, typical_story: 14.0, perim_mult: 1.0 }
     hash['SmallDataCenterHighITE'] = { aspect_ratio: 1.5, wwr: 0.0, typical_story: 14.0, perim_mult: 1.0 }
 
+    # Add Courthouse and Education
+    hash['Courthouse'] = { aspect_ratio: 2.06, wwr: 0.18, typical_story: 16.0, perim_mult: 1.0 }
+    hash['College'] = { aspect_ratio: 2.5, wwr: 0.037, typical_story: 13.0, perim_mult: 1.0 }
+
     # DEER Prototypes
     hash['Asm'] = { aspect_ratio: 1.0, wwr: 0.19, typical_story: 15.0 }
     hash['ECC'] = { aspect_ratio: 4.0, wwr: 0.25, typical_story: 13.0 }
@@ -646,7 +654,7 @@ module OsLib_ModelGeneration
       hash['Cafe'] = { ratio: 0.0103, space_type_gen: true, default: false }
       hash['CleanWork'] = { ratio: 0.0071, space_type_gen: true, default: false }
       hash['Conference'] = { ratio: 0.0082, space_type_gen: true, default: false }
-      hash['DresingRoom'] = { ratio: 0.0021, space_type_gen: true, default: false }
+      hash['DressingRoom'] = { ratio: 0.0021, space_type_gen: true, default: false }
       hash['Elec/MechRoom'] = { ratio: 0.0109, space_type_gen: true, default: false }
       hash['ElevatorPumpRoom'] = { ratio: 0.0022, space_type_gen: true, default: false }
       hash['Exam'] = { ratio: 0.1029, space_type_gen: true, default: true }
@@ -699,6 +707,44 @@ module OsLib_ModelGeneration
       hash['ComputerRoom'] = { ratio: 1.0, space_type_gen: true, default: true }
     elsif building_type == 'SmallDataCenterLowITE'
       hash['ComputerRoom'] = { ratio: 1.0, space_type_gen: true, default: true }
+    elsif building_type == 'Courthouse'
+      hash['Courthouse - Break Room'] = { ratio: 0.0067, space_type_gen: true, default: false }
+      hash['Courthouse - Cell'] = { ratio: 0.0731, space_type_gen: true, default: false }
+      hash['Courthouse - Conference'] = { ratio: 0.0203, space_type_gen: true, default: false }
+      hash['Courthouse - Corridor'] = { ratio: 0.0829, space_type_gen: true, default: false }
+      hash['Courthouse - Courtroom'] = { ratio: 0.1137, space_type_gen: true, default: false }
+      hash['Courthouse - Courtroom Waiting'] = { ratio: 0.051, space_type_gen: true, default: false }
+      hash['Courthouse - Elevator Lobby'] = { ratio: 0.0085, space_type_gen: true, default: false }
+      hash['Courthouse - Elevator Shaft'] = { ratio: 0.0047, space_type_gen: true, default: false }
+      hash['Courthouse - Entrance Lobby'] = { ratio: 0.0299, space_type_gen: true, default: false }
+      hash['Courthouse - Judges Chamber'] = { ratio: 0.0261, space_type_gen: true, default: false }
+      hash['Courthouse - Jury Assembly'] = { ratio: 0.0355, space_type_gen: true, default: false }
+      hash['Courthouse - Jury Deliberation'] = { ratio: 0.0133, space_type_gen: true, default: false }
+      hash['Courthouse - Library'] = { ratio: 0.0302, space_type_gen: true, default: false }
+      hash['Courthouse - Office'] = { ratio: 0.1930, space_type_gen: true, default: true }
+      hash['Courthouse - Parking'] = { ratio: 0.1083, space_type_gen: true, default: false }
+      hash['Courthouse - Restrooms'] = { ratio: 0.04, space_type_gen: true, default: false }
+      hash['Courthouse - Security Screening'] = { ratio: 0.0132, space_type_gen: true, default: false }
+      hash['Courthouse - Service Shaft'] = { ratio: 0.0019, space_type_gen: true, default: false }
+      hash['Courthouse - Stairs'] = { ratio: 0.0111, space_type_gen: true, default: false }
+      hash['Courthouse - Storage'] = { ratio: 0.0882, space_type_gen: true, default: false }
+      hash['Courthouse - Utility'] = { ratio: 0.0484, space_type_gen: true, default: false }
+    elsif building_type == 'College'
+      hash['College - Art Classroom'] = { ratio: 0.1868, space_type_gen: true, default: false }
+      hash['College - Classroom'] = { ratio: 0.2348, space_type_gen: true, default: true }
+      hash['College - Conference'] = { ratio: 0.0215, space_type_gen: true, default: false }
+      hash['College - Corridor'] = { ratio: 0.0716, space_type_gen: true, default: false }
+      hash['College - Elevator Shaft'] = { ratio: 0.0074, space_type_gen: true, default: false }
+      hash['College - Entrance Lobby'] = { ratio: 0.0117, space_type_gen: true, default: false }
+      hash['College - Laboratory'] = { ratio: 0.0843, space_type_gen: true, default: false }
+      hash['College - Lecture Hall'] = { ratio: 0.0421, space_type_gen: true, default: false }
+      hash['College - Lounge'] = { ratio: 0.028, space_type_gen: true, default: false }
+      hash['College - Media Center'] = { ratio: 0.0421, space_type_gen: true, default: false }
+      hash['College - Office'] = { ratio: 0.1894, space_type_gen: true, default: false }
+      hash['College - Restroom'] = { ratio: 0.0363, space_type_gen: true, default: false }
+      hash['College - Stairs'] = { ratio: 0.0272, space_type_gen: true, default: false }
+      hash['College - Storage'] = { ratio: 0.0117, space_type_gen: true, default: false }
+      hash['College - Utility'] = { ratio: 0.0051, space_type_gen: true, default: false }
       # DEER Prototypes
     elsif building_type == 'Asm'
       hash['Auditorium'] = { ratio: 0.7658, space_type_gen: true, default: true }
@@ -2773,7 +2819,7 @@ module OsLib_ModelGeneration
 
     # validate climate zone
     if !args.key?('climate_zone') || args['climate_zone'] == 'Lookup From Model'
-      climate_zone = standard.model_get_building_climate_zone_and_building_type(model)['climate_zone']
+      climate_zone = standard.model_get_building_properties(model)['climate_zone']
       runner.registerInfo("Using climate zone #{climate_zone} from model")
     else
       climate_zone = args['climate_zone']
@@ -3439,9 +3485,6 @@ module OsLib_ModelGeneration
     # mapping building_type name is needed for a few methods
     lookup_building_type = standard.model_get_lookup_name(building_type)
 
-    # remap small medium and large office to office
-    if building_type.include?('Office') then building_type = 'Office' end
-
     # get array of new space types
     space_types_new = []
 
@@ -3457,14 +3500,14 @@ module OsLib_ModelGeneration
 
         # create space type
         space_type = OpenStudio::Model::SpaceType.new(model)
-        space_type.setStandardsBuildingType(building_type)
+        space_type.setStandardsBuildingType(lookup_building_type)
         space_type.setStandardsSpaceType(space_type_name)
-        space_type.setName("#{building_type} #{space_type_name}")
+        space_type.setName("#{lookup_building_type} #{space_type_name}")
 
         # add to array of new space types
         space_types_new << space_type
 
-        # add internal loads (the nil check isn't ncessary, but I will keep it in as a warning instad of an error)
+        # add internal loads (the nil check isn't necessary, but I will keep it in as a warning instad of an error)
         test = standard.space_type_apply_internal_loads(space_type, true, true, true, true, true, true)
         if test.nil?
           runner.registerWarning("Could not add loads for #{space_type.name}. Not expected for #{template} #{lookup_building_type}")

data/lib/openstudio/extension/rake_task.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/runner.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/runner_config.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/version.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.6.0.rc1'.freeze
   end
 end

data/lib/openstudio/extension.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -87,6 +87,7 @@ module OpenStudio
       # do not call Bundler.require when requiring this file, only when calling this method
       result = []
       ObjectSpace.each_object(::Class) do |obj|
+
         next if !obj.ancestors.include?(OpenStudio::Extension::Extension)
 
         result << obj

data/lib/openstudio-extension.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/openstudio-extension.gemspec

@@ -29,13 +29,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 2.7.0'
 
   spec.add_dependency 'bcl', '~> 0.7.1'
-  spec.add_dependency 'bundler', '>= 2.1.0'
+  spec.add_dependency 'bundler', '~> 2.1.0'
   spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
   spec.add_dependency 'openstudio_measure_tester', '~> 0.3.1'
   spec.add_dependency 'openstudio-workflow', '~> 2.3.0'
   spec.add_dependency 'parallel', '~> 1.19.1'
 
-  spec.add_development_dependency 'openstudio-standards', '~> 0.2.13' # for os_lib unit tests
+  spec.add_development_dependency 'openstudio-standards', '~> 0.2.17.rc2' # for os_lib unit tests
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0.rc1
 platform: ruby
 authors:
 - Katherine Fleming
 - Nicholas Long
 - Daniel Macumber
 - David Goldwasser
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -31,14 +31,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
@@ -103,14 +103,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.2.17.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.13
+        version: 0.2.17.rc2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -233,8 +233,8 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.5.1
-post_install_message: 
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.6.0.rc1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -245,12 +245,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
-signing_key: 
+signing_key:
 specification_version: 4
 summary: openstudio base gem for creating generic extensions with encapsulated data
   and measures.