openstudio-model-articulation 0.8.0 → 0.10.0

data/lib/measures/create_deer_prototype_building/measure.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>create_deer_prototype_building</name>
   <uid>752055bd-10d9-4ede-8a35-18487fedf579</uid>
   <version_id>4cf31429-009e-4fbd-95bc-2edf0d325f0a</version_id>
@@ -801,10 +801,10 @@
   </attributes>
   <files>
     <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -813,16 +813,10 @@
       <checksum>A5517AE1</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
-    <file>
-      <filename>deer_building_types.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>26AEAF70</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -835,6 +829,12 @@
       <usage_type>script</usage_type>
       <checksum>7F717C97</checksum>
     </file>
+    <file>
+      <filename>deer_building_types.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>26AEAF70</checksum>
+    </file>
     <file>
       <filename>create_DEER_prototype_building_test.rb</filename>
       <filetype>rb</filetype>

data/lib/measures/create_parametric_schedules/measure.rb

@@ -8,16 +8,11 @@
 
 require 'json'
 
-# load OpenStudio measure libraries from openstudio-extension gem
-require 'openstudio-extension'
-require 'openstudio/extension/core/os_lib_helper_methods'
-require 'openstudio/extension/core/os_lib_schedules'
+# load openstudio-standards gem
+require 'openstudio-standards'
 
 # start the measure
 class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
-  # resource file modules
-  include OsLib_HelperMethods
-  include OsLib_Schedules
 
   # human readable name
   def name
@@ -496,7 +491,8 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
     super(model, runner, user_arguments)
 
     # assign the user inputs to variables
-    args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model))
+    args = runner.getArgumentValues(arguments(model), user_arguments)
+    args = Hash[args.collect{ |k, v| [k.to_s, v] }]
     if !args then return false end
 
     # create array from argument, clean up and check if measure should alter model
@@ -510,7 +506,8 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
     end
 
     # look at upstream measure for 'hoo_per_week' argument
-    hoo_per_week_from_osw = OsLib_HelperMethods.check_upstream_measure_for_arg(runner, 'hoo_per_week')
+    hoo_per_week_from_osw = runner.getPastStepValuesForName('hoo_per_week')
+    hoo_per_week_from_osw = hoo_per_week_from_osw.collect{ |k, v| Hash[:measure_name => k, :value => v] }.first if !hoo_per_week_from_osw.empty?
     if !hoo_per_week_from_osw.empty?
       runner.registerInfo("Replacing argument named 'hoo_per_week' from current measure with a value of #{hoo_per_week_from_osw[:value]} from #{hoo_per_week_from_osw[:measure_name]}.")
       args['hoo_per_week'] = hoo_per_week_from_osw[:value].to_f
@@ -716,7 +713,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    hoo_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    hoo_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     default_schedule_set.setHoursofOperationSchedule(hoo_sch)
 
     # create activity schedule
@@ -731,7 +728,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    activity_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    activity_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     default_schedule_set.setPeopleActivityLevelSchedule(activity_sch)
 
     # generate and apply lighting schedule using hours of operation schedule and parametric inputs
@@ -750,7 +747,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'default_day' => default_day,
                 'rules' => rules }
 
-    lighting_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    lighting_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     lighting_sch.setComment(args['lighting_profiles'])
     default_schedule_set.setLightingSchedule(lighting_sch)
 
@@ -769,7 +766,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    electric_equipment_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    electric_equipment_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     electric_equipment_sch.setComment(args['electric_equipment_profiles'])
     default_schedule_set.setElectricEquipmentSchedule(electric_equipment_sch)
 
@@ -788,7 +785,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    gas_equipment_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    gas_equipment_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     gas_equipment_sch.setComment(args['gas_equipment_profiles'])
     default_schedule_set.setGasEquipmentSchedule(gas_equipment_sch)
 
@@ -807,7 +804,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    occupancy_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    occupancy_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     occupancy_sch.setComment(args['occupancy_profiles'])
     default_schedule_set.setNumberofPeopleSchedule(occupancy_sch)
 
@@ -826,7 +823,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    infiltration_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    infiltration_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     infiltration_sch.setComment(args['infiltration_profiles'])
     default_schedule_set.setInfiltrationSchedule(infiltration_sch)
 
@@ -845,7 +842,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    hvac_availability_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    hvac_availability_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     hvac_availability_sch.setComment(args['hvac_availability_profiles'])
 
     # apply HVAC schedules
@@ -880,7 +877,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    heating_setpoint_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    heating_setpoint_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
 
     # generate and apply cooling_setpoint schedule using hours of operation schedule and parametric inputs
     ruleset_name = 'Parametric Cooling Setpoint Schedule'
@@ -908,7 +905,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    cooling_setpoint_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    cooling_setpoint_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
 
     # apply heating and cooling setpoint schedules
     thermostats_to_alter.each do |thermostat|
@@ -931,7 +928,7 @@ class CreateParametricSchedules < OpenStudio::Measure::ModelMeasure
                 'summer_design_day' => summer_design_day,
                 'default_day' => default_day,
                 'rules' => rules }
-    swh_sch = OsLib_Schedules.createComplexSchedule(model, options)
+    swh_sch = OpenstudioStandards::Schedules.create_complex_schedule(model, options)
     swh_sch.setComment(args['swh_profiles'])
     water_use_equipment_to_alter.each do |water_use_equipment|
       water_use_equipment.setFlowRateFractionSchedule(swh_sch)

data/lib/measures/create_parametric_schedules/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>create_parametric_schedules</name>
   <uid>befa8099-c6a7-4045-8792-53fc7124b862</uid>
-  <version_id>db9fad27-ccad-42d5-81ff-615976c88be9</version_id>
-  <version_modified>20230602T160045Z</version_modified>
+  <version_id>a6fcf75a-32c7-4f10-99a4-80c99b9dbf69</version_id>
+  <version_modified>2024-05-20T07:54:34Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>CreateParametricSchedules</class_name>
   <display_name>Create Parametric Schedules</display_name>
@@ -300,10 +300,10 @@
   </attributes>
   <files>
     <file>
-      <filename>example_model.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>8A9CF7E6</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -317,22 +317,16 @@
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.1.0</identifier>
-        <min_compatible>2.8.0</min_compatible>
+        <min_compatible>3.8.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>593813C9</checksum>
+      <checksum>7546678F</checksum>
     </file>
     <file>
       <filename>create_parametric_schedules_test.rb</filename>
@@ -340,5 +334,11 @@
       <usage_type>test</usage_type>
       <checksum>CEE46F8D</checksum>
     </file>
+    <file>
+      <filename>example_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8A9CF7E6</checksum>
+    </file>
   </files>
 </measure>

data/lib/measures/create_typical_building_from_model/README.md

@@ -205,7 +205,7 @@ ___
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["DOE Ref Pre-1980", "DOE Ref 1980-2004", "90.1-2004", "90.1-2007", "90.1-2010", "90.1-2013", "90.1-2016", "90.1-2019", "ComStock DOE Ref Pre-1980", "ComStock DOE Ref 1980-2004", "ComStock 90.1-2004", "ComStock 90.1-2007", "ComStock 90.1-2010", "ComStock 90.1-2013", "ComStock 90.1-2016", "ComStock 90.1-2019", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020"]
+**Choice Display Names** ["DOE Ref Pre-1980", "DOE Ref 1980-2004", "90.1-2004", "90.1-2007", "90.1-2010", "90.1-2013", "90.1-2016", "90.1-2019", "ComStock DOE Ref Pre-1980", "ComStock DOE Ref 1980-2004", "ComStock 90.1-2004", "ComStock 90.1-2007", "ComStock 90.1-2010", "ComStock 90.1-2013", "ComStock 90.1-2016", "ComStock 90.1-2019", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020", "ComStock DEER Pre-1975", "ComStock DEER 1985", "ComStock DEER 1996", "ComStock DEER 2003", "ComStock DEER 2007", "ComStock DEER 2011", "ComStock DEER 2014", "ComStock DEER 2015", "ComStock DEER 2017", "ComStock DEER 2020"]
 
 
 ### HVAC System Type
@@ -216,7 +216,7 @@ ___
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["Inferred", "Ideal Air Loads", "Baseboard electric", "Baseboard gas boiler", "Baseboard central air source heat pump", "Baseboard district hot water", "Direct evap coolers with baseboard electric", "Direct evap coolers with baseboard gas boiler", "Direct evap coolers with baseboard central air source heat pump", "Direct evap coolers with baseboard district hot water", "Direct evap coolers with forced air furnace", "Direct evap coolers with gas unit heaters", "Direct evap coolers with no heat", "DOAS with fan coil chiller with boiler", "DOAS with fan coil chiller with central air source heat pump", "DOAS with fan coil chiller with district hot water", "DOAS with fan coil chiller with baseboard electric", "DOAS with fan coil chiller with gas unit heaters", "DOAS with fan coil chiller with no heat", "DOAS with fan coil air-cooled chiller with boiler", "DOAS with fan coil air-cooled chiller with central air source heat pump", "DOAS with fan coil air-cooled chiller with district hot water", "DOAS with fan coil air-cooled chiller with baseboard electric", "DOAS with fan coil air-cooled chiller with gas unit heaters", "DOAS with fan coil air-cooled chiller with no heat", "DOAS with fan coil district chilled water with boiler", "DOAS with fan coil district chilled water with central air source heat pump", "DOAS with fan coil district chilled water with district hot water", "DOAS with fan coil district chilled water with baseboard electric", "DOAS with fan coil district chilled water with gas unit heaters", "DOAS with fan coil district chilled water with no heat", "DOAS with VRF", "DOAS with water source heat pumps fluid cooler with boiler", "DOAS with water source heat pumps cooling tower with boiler", "DOAS with water source heat pumps with ground source heat pump", "DOAS with water source heat pumps district chilled water with district hot water", "Fan coil chiller with boiler", "Fan coil chiller with central air source heat pump", "Fan coil chiller with district hot water", "Fan coil chiller with baseboard electric", "Fan coil chiller with gas unit heaters", "Fan coil chiller with no heat", "Fan coil air-cooled chiller with boiler", "Fan coil air-cooled chiller with central air source heat pump", "Fan coil air-cooled chiller with district hot water", "Fan coil air-cooled chiller with baseboard electric", "Fan coil air-cooled chiller with gas unit heaters", "Fan coil air-cooled chiller with no heat", "Fan coil district chilled water with boiler", "Fan coil district chilled water with central air source heat pump", "Fan coil district chilled water with district hot water", "Fan coil district chilled water with baseboard electric", "Fan coil district chilled water with gas unit heaters", "Fan coil district chilled water with no heat", "Forced air furnace", "Gas unit heaters", "PTAC with baseboard electric", "PTAC with baseboard gas boiler", "PTAC with baseboard district hot water", "PTAC with gas unit heaters", "PTAC with electric coil", "PTAC with gas coil", "PTAC with gas boiler", "PTAC with central air source heat pump", "PTAC with district hot water", "PTAC with no heat", "PTHP", "PSZ-AC with baseboard electric", "PSZ-AC with baseboard gas boiler", "PSZ-AC with baseboard district hot water", "PSZ-AC with gas unit heaters", "PSZ-AC with electric coil", "PSZ-AC with gas coil", "PSZ-AC with gas boiler", "PSZ-AC with central air source heat pump", "PSZ-AC with district hot water", "PSZ-AC with no heat", "PSZ-AC district chilled water with baseboard electric", "PSZ-AC district chilled water with baseboard gas boiler", "PSZ-AC district chilled water with baseboard district hot water", "PSZ-AC district chilled water with gas unit heaters", "PSZ-AC district chilled water with electric coil", "PSZ-AC district chilled water with gas coil", "PSZ-AC district chilled water with gas boiler", "PSZ-AC district chilled water with central air source heat pump", "PSZ-AC district chilled water with district hot water", "PSZ-AC district chilled water with no heat", "PSZ-HP", "PVAV with gas boiler reheat", "PVAV with central air source heat pump reheat", "PVAV with district hot water reheat", "PVAV with PFP boxes", "PVAV with gas heat with electric reheat", "Residential AC with baseboard electric", "Residential AC with baseboard gas boiler", "Residential AC with baseboard central air source heat pump", "Residential AC with baseboard district hot water", "Residential AC with residential forced air furnace", "Residential AC with no heat", "Residential heat pump", "Residential heat pump with no cooling", "Residential forced air furnace", "VAV chiller with gas boiler reheat", "VAV chiller with central air source heat pump reheat", "VAV chiller with district hot water reheat", "VAV chiller with PFP boxes", "VAV chiller with gas coil reheat", "VAV chiller with no reheat with baseboard electric", "VAV chiller with no reheat with gas unit heaters", "VAV chiller with no reheat with zone heat pump", "VAV air-cooled chiller with gas boiler reheat", "VAV air-cooled chiller with central air source heat pump reheat", "VAV air-cooled chiller with district hot water reheat", "VAV air-cooled chiller with PFP boxes", "VAV air-cooled chiller with gas coil reheat", "VAV air-cooled chiller with no reheat with baseboard electric", "VAV air-cooled chiller with no reheat with gas unit heaters", "VAV air-cooled chiller with no reheat with zone heat pump", "VAV district chilled water with gas boiler reheat", "VAV district chilled water with central air source heat pump reheat", "VAV district chilled water with district hot water reheat", "VAV district chilled water with PFP boxes", "VAV district chilled water with gas coil reheat", "VAV district chilled water with no reheat with baseboard electric", "VAV district chilled water with no reheat with gas unit heaters", "VAV district chilled water with no reheat with zone heat pump", "VRF", "Water source heat pumps fluid cooler with boiler", "Water source heat pumps cooling tower with boiler", "Water source heat pumps with ground source heat pump", "Water source heat pumps district chilled water with district hot water", "Window AC with baseboard electric", "Window AC with baseboard gas boiler", "Window AC with baseboard central air source heat pump", "Window AC with baseboard district hot water", "Window AC with forced air furnace", "Window AC with unit heaters", "Window AC with no heat"]
+**Choice Display Names** ["Inferred", "Ideal Air Loads", "Baseboard electric", "Baseboard gas boiler", "Baseboard central air source heat pump", "Baseboard district hot water", "Direct evap coolers with baseboard electric", "Direct evap coolers with baseboard gas boiler", "Direct evap coolers with baseboard central air source heat pump", "Direct evap coolers with baseboard district hot water", "Direct evap coolers with forced air furnace", "Direct evap coolers with gas unit heaters", "Direct evap coolers with no heat", "DOAS with fan coil chiller with boiler", "DOAS with fan coil chiller with central air source heat pump", "DOAS with fan coil chiller with district hot water", "DOAS with fan coil chiller with baseboard electric", "DOAS with fan coil chiller with gas unit heaters", "DOAS with fan coil chiller with no heat", "DOAS with fan coil air-cooled chiller with boiler", "DOAS with fan coil air-cooled chiller with central air source heat pump", "DOAS with fan coil air-cooled chiller with district hot water", "DOAS with fan coil air-cooled chiller with baseboard electric", "DOAS with fan coil air-cooled chiller with gas unit heaters", "DOAS with fan coil air-cooled chiller with no heat", "DOAS with fan coil district chilled water with boiler", "DOAS with fan coil district chilled water with central air source heat pump", "DOAS with fan coil district chilled water with district hot water", "DOAS with fan coil district chilled water with baseboard electric", "DOAS with fan coil district chilled water with gas unit heaters", "DOAS with fan coil district chilled water with no heat", "DOAS with VRF", "DOAS with water source heat pumps fluid cooler with boiler", "DOAS with water source heat pumps cooling tower with boiler", "DOAS with water source heat pumps with ground source heat pump", "DOAS with water source heat pumps district chilled water with district hot water", "Fan coil chiller with boiler", "Fan coil chiller with central air source heat pump", "Fan coil chiller with district hot water", "Fan coil chiller with baseboard electric", "Fan coil chiller with gas unit heaters", "Fan coil chiller with no heat", "Fan coil air-cooled chiller with boiler", "Fan coil air-cooled chiller with central air source heat pump", "Fan coil air-cooled chiller with district hot water", "Fan coil air-cooled chiller with baseboard electric", "Fan coil air-cooled chiller with gas unit heaters", "Fan coil air-cooled chiller with no heat", "Fan coil district chilled water with boiler", "Fan coil district chilled water with central air source heat pump", "Fan coil district chilled water with district hot water", "Fan coil district chilled water with baseboard electric", "Fan coil district chilled water with gas unit heaters", "Fan coil district chilled water with no heat", "Forced air furnace", "Gas unit heaters", "PTAC with baseboard electric", "PTAC with baseboard gas boiler", "PTAC with baseboard district hot water", "PTAC with gas unit heaters", "PTAC with electric coil", "PTAC with gas coil", "PTAC with gas boiler", "PTAC with central air source heat pump", "PTAC with district hot water", "PTAC with no heat", "PTHP", "PSZ-AC with baseboard electric", "PSZ-AC with baseboard gas boiler", "PSZ-AC with baseboard district hot water", "PSZ-AC with gas unit heaters", "PSZ-AC with electric coil", "PSZ-AC with gas coil", "PSZ-AC with gas boiler", "PSZ-AC with central air source heat pump", "PSZ-AC with district hot water", "PSZ-AC with no heat", "PSZ-AC district chilled water with baseboard electric", "PSZ-AC district chilled water with baseboard gas boiler", "PSZ-AC district chilled water with baseboard district hot water", "PSZ-AC district chilled water with gas unit heaters", "PSZ-AC district chilled water with electric coil", "PSZ-AC district chilled water with gas coil", "PSZ-AC district chilled water with gas boiler", "PSZ-AC district chilled water with central air source heat pump", "PSZ-AC district chilled water with district hot water", "PSZ-AC district chilled water with no heat", "PSZ-HP", "PVAV with gas boiler reheat", "PVAV with central air source heat pump reheat", "PVAV with district hot water reheat", "PVAV with PFP boxes", "PVAV with gas heat with electric reheat", "PVAV with gas coil heat with electric reheat", "PVAV with gas boiler heat with electric reheat", "Residential AC with baseboard electric", "Residential AC with baseboard gas boiler", "Residential AC with baseboard central air source heat pump", "Residential AC with baseboard district hot water", "Residential AC with residential forced air furnace", "Residential AC with no heat", "Residential heat pump", "Residential heat pump with no cooling", "Residential forced air furnace", "VAV chiller with gas boiler reheat", "VAV chiller with central air source heat pump reheat", "VAV chiller with district hot water reheat", "VAV chiller with PFP boxes", "VAV chiller with gas coil reheat", "VAV chiller with no reheat with baseboard electric", "VAV chiller with no reheat with gas unit heaters", "VAV chiller with no reheat with zone heat pump", "VAV air-cooled chiller with gas boiler reheat", "VAV air-cooled chiller with central air source heat pump reheat", "VAV air-cooled chiller with district hot water reheat", "VAV air-cooled chiller with PFP boxes", "VAV air-cooled chiller with gas coil reheat", "VAV air-cooled chiller with no reheat with baseboard electric", "VAV air-cooled chiller with no reheat with gas unit heaters", "VAV air-cooled chiller with no reheat with zone heat pump", "VAV district chilled water with gas boiler reheat", "VAV district chilled water with central air source heat pump reheat", "VAV district chilled water with district hot water reheat", "VAV district chilled water with PFP boxes", "VAV district chilled water with gas coil reheat", "VAV district chilled water with no reheat with baseboard electric", "VAV district chilled water with no reheat with gas unit heaters", "VAV district chilled water with no reheat with zone heat pump", "VRF", "Water source heat pumps fluid cooler with boiler", "Water source heat pumps cooling tower with boiler", "Water source heat pumps with ground source heat pump", "Water source heat pumps district chilled water with district hot water", "Window AC with baseboard electric", "Window AC with baseboard gas boiler", "Window AC with baseboard central air source heat pump", "Window AC with baseboard district hot water", "Window AC with forced air furnace", "Window AC with unit heaters", "Window AC with no heat"]
 
 
 ### HVAC System Delivery Type
@@ -227,7 +227,7 @@ How the HVAC system delivers heating or cooling to the zone.
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["Forced Air", "Hydronic"]
+**Choice Display Names** ["Forced Air", "Hydronic", "Inferred"]
 
 
 ### HVAC Heating Source
@@ -238,7 +238,7 @@ The primary source of heating used by HVAC systems in the model.
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["Electricity", "NaturalGas", "DistrictHeating", "DistrictAmbient"]
+**Choice Display Names** ["Electricity", "NaturalGas", "DistrictHeating", "DistrictAmbient", "Inferred"]
 
 
 ### HVAC Cooling Source
@@ -249,7 +249,7 @@ The primary source of cooling used by HVAC systems in the model.
 **Required:** true,
 **Model Dependent:** false
 
-**Choice Display Names** ["Electricity", "DistrictCooling", "DistrictAmbient"]
+**Choice Display Names** ["Electricity", "DistrictCooling", "DistrictAmbient", "Inferred"]
 
 
 ### Service Water Heating Source
@@ -294,6 +294,17 @@ Construction Set will be applied to entire building
 **Model Dependent:** false
 
 
+### Wall Construction Type
+Identify Exterior Wall Construction Type to be applied to entire building
+**Name:** wall_construction_type,
+**Type:** Choice,
+**Units:** ,
+**Required:** true,
+**Model Dependent:** false
+
+**Choice Display Names** ["Mass", "Metal Building", "SteelFramed", "WoodFramed", "Inferred"]
+
+
 ### Add Space Type Loads to Model
 Populate existing space types in model with internal loads.
 **Name:** add_space_type_loads,
@@ -474,17 +485,6 @@ By default this will force daylight savings to be enabled. Set to false if in a
 **Model Dependent:** false
 
 
-### Climate Zone.
-
-**Name:** climate_zone,
-**Type:** Choice,
-**Units:** ,
-**Required:** true,
-**Model Dependent:** false
-
-**Choice Display Names** ["Lookup From Model", "ASHRAE 169-2013-1A", "ASHRAE 169-2013-1B", "ASHRAE 169-2013-2A", "ASHRAE 169-2013-2B", "ASHRAE 169-2013-3A", "ASHRAE 169-2013-3B", "ASHRAE 169-2013-3C", "ASHRAE 169-2013-4A", "ASHRAE 169-2013-4B", "ASHRAE 169-2013-4C", "ASHRAE 169-2013-5A", "ASHRAE 169-2013-5B", "ASHRAE 169-2013-5C", "ASHRAE 169-2013-6A", "ASHRAE 169-2013-6B", "ASHRAE 169-2013-7A", "ASHRAE 169-2013-8A", "CEC T24-CEC1", "CEC T24-CEC2", "CEC T24-CEC3", "CEC T24-CEC4", "CEC T24-CEC5", "CEC T24-CEC6", "CEC T24-CEC7", "CEC T24-CEC8", "CEC T24-CEC9", "CEC T24-CEC10", "CEC T24-CEC11", "CEC T24-CEC12", "CEC T24-CEC13", "CEC T24-CEC14", "CEC T24-CEC15", "CEC T24-CEC16"]
-
-
 
 
 

data/lib/measures/create_typical_building_from_model/measure.rb

@@ -5,18 +5,10 @@
 
 require 'openstudio-standards'
 
-# load OpenStudio measure libraries from openstudio-extension gem
-require 'openstudio-extension'
-require 'openstudio/extension/core/os_lib_helper_methods'
-require 'openstudio/extension/core/os_lib_model_generation'
-
-require_relative 'resources/Model.hvac' # DLM: should this be in openstudio-standards? dfg some tests fail without it
+#require_relative 'resources/Model.hvac' # DLM: should this be in openstudio-standards? dfg some tests fail without it
 
 # start the measure
 class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
-  # resource file modules
-  include OsLib_HelperMethods
-  include OsLib_ModelGeneration
 
   # human readable name
   def name
@@ -44,7 +36,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
 
     # see if building name contains any template values
     default_string = '90.1-2010'
-    get_templates.each do |template_string|
+    OpenstudioStandards::CreateTypical.get_templates.each do |template_string|
       if model.getBuilding.name.to_s.include?(template_string)
         default_string = template_string
         next
@@ -52,7 +44,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     end
 
     # Make argument for template
-    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_templates, true)
+    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', OpenstudioStandards::CreateTypical.get_templates, true)
     template.setDisplayName('Target Standard')
     template.setDefaultValue(default_string)
     args << template
@@ -152,6 +144,8 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     hvac_chs << 'PVAV with district hot water reheat'
     hvac_chs << 'PVAV with PFP boxes'
     hvac_chs << 'PVAV with gas heat with electric reheat'
+    hvac_chs << 'PVAV with gas coil heat with electric reheat'
+    hvac_chs << 'PVAV with gas boiler heat with electric reheat'
     hvac_chs << 'Residential AC with baseboard electric'
     hvac_chs << 'Residential AC with baseboard gas boiler'
     hvac_chs << 'Residential AC with baseboard central air source heat pump'
@@ -207,6 +201,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     hvac_type_chs = OpenStudio::StringVector.new
     hvac_type_chs << 'Forced Air'
     hvac_type_chs << 'Hydronic'
+    hvac_type_chs << 'Inferred'
     hvac_delivery_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('hvac_delivery_type', hvac_type_chs, true)
     hvac_delivery_type.setDisplayName('HVAC System Delivery Type')
     hvac_delivery_type.setDescription('How the HVAC system delivers heating or cooling to the zone.')
@@ -219,6 +214,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     htg_src_chs << 'NaturalGas'
     htg_src_chs << 'DistrictHeating'
     htg_src_chs << 'DistrictAmbient'
+    htg_src_chs << 'Inferred'
     htg_src = OpenStudio::Measure::OSArgument.makeChoiceArgument('htg_src', htg_src_chs, true)
     htg_src.setDisplayName('HVAC Heating Source')
     htg_src.setDescription('The primary source of heating used by HVAC systems in the model.')
@@ -230,6 +226,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     clg_src_chs << 'Electricity'
     clg_src_chs << 'DistrictCooling'
     clg_src_chs << 'DistrictAmbient'
+    clg_src_chs << 'Inferred'
     clg_src = OpenStudio::Measure::OSArgument.makeChoiceArgument('clg_src', clg_src_chs, true)
     clg_src.setDisplayName('HVAC Cooling Source')
     clg_src.setDescription('The primary source of cooling used by HVAC systems in the model.')
@@ -290,6 +287,19 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     add_constructions.setDefaultValue(true)
     args << add_constructions
 
+    # make argument for wall_construction_type
+    wall_construction_type_choices = OpenStudio::StringVector.new
+    wall_construction_type_choices << 'Mass'
+    wall_construction_type_choices << 'Metal Building'
+    wall_construction_type_choices << 'SteelFramed'
+    wall_construction_type_choices << 'WoodFramed'
+    wall_construction_type_choices << 'Inferred'
+    wall_construction_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('wall_construction_type', wall_construction_type_choices, true)
+    wall_construction_type.setDisplayName('Wall Construction Type')
+    wall_construction_type.setDescription('Identify Exterior Wall Construction Type to be applied to entire building')
+    wall_construction_type.setDefaultValue('Inferred')
+    args << wall_construction_type
+
     # make an argument for add_space_type_loads
     add_space_type_loads = OpenStudio::Measure::OSArgument.makeBoolArgument('add_space_type_loads', true)
     add_space_type_loads.setDisplayName('Add Space Type Loads to Model')
@@ -373,6 +383,8 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     wkdy_op_hrs_start_time.setDescription('Enter 24 hour values with fractional values converted to minutes. e.g. 17.25 = 5:15pm. Only used if Modify weekday hours of operation is true.')
     wkdy_op_hrs_start_time.setUnits('Hours')
     wkdy_op_hrs_start_time.setDefaultValue(8.0)
+    wkdy_op_hrs_start_time.setMinValue(0.0)
+    wkdy_op_hrs_start_time.setMaxValue(24.0)
     args << wkdy_op_hrs_start_time
 
     # weekday hours of operation duration
@@ -381,6 +393,8 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     wkdy_op_hrs_duration.setDescription('Length of weekday operating hours. Enter 24 hour values with fractional values converted to minutes. e.g. 17.25 = 5:15pm. Only used if Modify weekday hours of operation is true.')
     wkdy_op_hrs_duration.setUnits('Hours')
     wkdy_op_hrs_duration.setDefaultValue(8.0)
+    wkdy_op_hrs_duration.setMinValue(0.0)
+    wkdy_op_hrs_duration.setMaxValue(24.0)
     args << wkdy_op_hrs_duration
 
     # modify weekend hours of operation
@@ -396,6 +410,8 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     wknd_op_hrs_start_time.setDescription('Enter 24 hour values with fractional values converted to minutes. e.g. 17.25 = 5:15pm.  Only used if Modify weekend hours of operation is true.')
     wknd_op_hrs_start_time.setUnits('Hours')
     wknd_op_hrs_start_time.setDefaultValue(8.0)
+    wknd_op_hrs_start_time.setMinValue(0.0)
+    wknd_op_hrs_start_time.setMaxValue(24.0)
     args << wknd_op_hrs_start_time
 
     # weekend hours of operation duration
@@ -404,6 +420,8 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     wknd_op_hrs_duration.setDescription('Length of weekend operating hours. Enter 24 hour values with fractional values converted to minutes. e.g. 17.25 = 5:15pm.  Only used if Modify weekend hours of operation is true.')
     wknd_op_hrs_duration.setUnits('Hours')
     wknd_op_hrs_duration.setDefaultValue(8.0)
+    wknd_op_hrs_duration.setMinValue(0.0)
+    wknd_op_hrs_duration.setMaxValue(24.0)
     args << wknd_op_hrs_duration
 
     # make an argument for unmet_hours_tolerance
@@ -411,6 +429,7 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     unmet_hours_tolerance.setDisplayName('Unmet Hours Tolerance')
     unmet_hours_tolerance.setDescription('Set the thermostat setpoint tolerance for unmet hours in degrees Rankine')
     unmet_hours_tolerance.setDefaultValue(1.0)
+    unmet_hours_tolerance.setMinValue(0.0)
     args << unmet_hours_tolerance
 
     # make an argument for remove_objects
@@ -434,12 +453,6 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
     enable_dst.setDefaultValue(true)
     args << enable_dst
 
-    # Argument used to make ComStock tsv workflow run correctly
-    climate_zone = OpenStudio::Measure::OSArgument.makeChoiceArgument('climate_zone', get_climate_zones(false, 'Lookup From Model'), true)
-    climate_zone.setDisplayName('Climate Zone.')
-    climate_zone.setDefaultValue('Lookup From Model')
-    args << climate_zone
-
     return args
   end
 
@@ -447,8 +460,61 @@ class CreateTypicalBuildingFromModel < OpenStudio::Measure::ModelMeasure
   def run(model, runner, user_arguments)
     super(model, runner, user_arguments)
 
+    # assign the user inputs to variables
+    args = runner.getArgumentValues(arguments(model), user_arguments)
+    args = Hash[args.collect{ |k, v| [k.to_s, v] }]
+    if !args then return false end
+
+    # todo - need to make use of this before pass to standards
+    use_upstream_args = args['use_upstream_args']
+
+    # open channel to log messages
+    reset_log
+
+    # Turn debugging output on/off
+    debug = false
+
     # method run from os_lib_model_generation.rb
-    result = typical_building_from_model(model, runner, user_arguments)
+    result = OpenstudioStandards::CreateTypical.create_typical_building_from_model(
+      model,
+      args['template'],
+      climate_zone: nil, # not exposed in user measure args
+      add_hvac: args['add_hvac'],
+      hvac_system_type: args['system_type'],
+      hvac_delivery_type: args['hvac_delivery_type'],
+      heating_fuel: args['htg_src'],
+      service_water_heating_fuel: args['swh_src'],
+      cooling_fuel: args['clg_src'],
+      kitchen_makeup: args['kitchen_makeup'],
+      exterior_lighting_zone: args['exterior_lighting_zone'],
+      add_constructions: args['add_constructions'],
+      wall_construction_type: args['wall_construction_type'],
+      add_space_type_loads: args['add_space_type_loads'],
+      add_daylighting_controls: nil, # not exposed in user measure args
+      add_elevators: args['add_elevators'],
+      add_internal_mass: args['add_internal_mass'],
+      add_exterior_lights: args['add_exterior_lights'],
+      onsite_parking_fraction: args['onsite_parking_fraction'],
+      add_exhaust: args['add_exhaust'],
+      add_swh: args['add_swh'],
+      add_thermostat: args['add_thermostat'],
+      add_refrigeration: args['add_refrigeration'],
+      modify_wkdy_op_hrs: args['modify_wkdy_op_hrs'],
+      wkdy_op_hrs_start_time: args['wkdy_op_hrs_start_time'],
+      wkdy_op_hrs_duration: args['wkdy_op_hrs_duration'],
+      modify_wknd_op_hrs: args['modify_wknd_op_hrs'],
+      wknd_op_hrs_start_time: args['wknd_op_hrs_start_time'],
+      wknd_op_hrs_duration: args['wknd_op_hrs_duration'],
+      hoo_var_method: nil, # not exposed in user measure args
+      enable_dst: args['enable_dst'],
+      unmet_hours_tolerance_r: args['unmet_hours_tolerance'],
+      remove_objects: args['remove_objects'],
+      user_hvac_mapping: nil, # not exposed in this measure yet?
+      sizing_run_directory: nil) # not exposed in user measure args
+
+    # gather log
+    log_messages_to_runner(runner, debug)
+    reset_log
 
     if result == false
       return false