openstudio-model-articulation 0.9.0 → 0.10.0

data/lib/measures/create_typical_doe_building_from_model/measure.rb

@@ -8,19 +8,11 @@
 
 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
 
 # start the measure
 class CreateTypicalDOEBuildingFromModel < OpenStudio::Measure::ModelMeasure
-  # resource file modules
-  include OsLib_HelperMethods
-  include OsLib_ModelGeneration
-
+  
   # human readable name
   def name
     return 'Create Typical DOE Building from Model'
@@ -47,7 +39,7 @@ class CreateTypicalDOEBuildingFromModel < 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_doe_templates.each do |template_string|
       if model.getBuilding.name.to_s.include?(template_string)
         default_string = template_string
         next
@@ -55,7 +47,7 @@ class CreateTypicalDOEBuildingFromModel < OpenStudio::Measure::ModelMeasure
     end
 
     # Make argument for template
-    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_doe_templates(false), true)
+    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', OpenstudioStandards::CreateTypical.get_doe_templates, true)
     template.setDisplayName('Target Standard')
     template.setDefaultValue(default_string)
     args << template
@@ -155,6 +147,8 @@ class CreateTypicalDOEBuildingFromModel < 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'
@@ -210,6 +204,7 @@ class CreateTypicalDOEBuildingFromModel < 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.')
@@ -222,6 +217,7 @@ class CreateTypicalDOEBuildingFromModel < 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.')
@@ -233,6 +229,7 @@ class CreateTypicalDOEBuildingFromModel < 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.')
@@ -293,6 +290,19 @@ class CreateTypicalDOEBuildingFromModel < 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')
@@ -376,6 +386,8 @@ class CreateTypicalDOEBuildingFromModel < 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
@@ -384,6 +396,8 @@ class CreateTypicalDOEBuildingFromModel < 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
@@ -399,6 +413,8 @@ class CreateTypicalDOEBuildingFromModel < 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
@@ -407,6 +423,8 @@ class CreateTypicalDOEBuildingFromModel < 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
@@ -414,6 +432,7 @@ class CreateTypicalDOEBuildingFromModel < 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
@@ -444,8 +463,61 @@ class CreateTypicalDOEBuildingFromModel < 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

data/lib/measures/create_typical_doe_building_from_model/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_typical_doe_building_from_model</name>
   <uid>b2c80210-33b3-4dfd-8267-535efd81f552</uid>
-  <version_id>d8873c5e-11ce-48a3-97cf-722dc2ee6031</version_id>
-  <version_modified>20230602T160046Z</version_modified>
+  <version_id>2f42ddde-0650-44dc-8dff-bb2338a0786c</version_id>
+  <version_modified>2024-05-20T07:54:34Z</version_modified>
   <xml_checksum>99E7000D</xml_checksum>
   <class_name>CreateTypicalDOEBuildingFromModel</class_name>
   <display_name>Create Typical DOE Building from Model</display_name>
@@ -465,6 +465,14 @@
           <value>PVAV with gas heat with electric reheat</value>
           <display_name>PVAV with gas heat with electric reheat</display_name>
         </choice>
+        <choice>
+          <value>PVAV with gas coil heat with electric reheat</value>
+          <display_name>PVAV with gas coil heat with electric reheat</display_name>
+        </choice>
+        <choice>
+          <value>PVAV with gas boiler heat with electric reheat</value>
+          <display_name>PVAV with gas boiler heat with electric reheat</display_name>
+        </choice>
         <choice>
           <value>Residential AC with baseboard electric</value>
           <display_name>Residential AC with baseboard electric</display_name>
@@ -664,6 +672,10 @@
           <value>Hydronic</value>
           <display_name>Hydronic</display_name>
         </choice>
+        <choice>
+          <value>Inferred</value>
+          <display_name>Inferred</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -691,6 +703,10 @@
           <value>DistrictAmbient</value>
           <display_name>DistrictAmbient</display_name>
         </choice>
+        <choice>
+          <value>Inferred</value>
+          <display_name>Inferred</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -714,6 +730,10 @@
           <value>DistrictAmbient</value>
           <display_name>DistrictAmbient</display_name>
         </choice>
+        <choice>
+          <value>Inferred</value>
+          <display_name>Inferred</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -816,6 +836,37 @@
         </choice>
       </choices>
     </argument>
+    <argument>
+      <name>wall_construction_type</name>
+      <display_name>Wall Construction Type</display_name>
+      <description>Identify Exterior Wall Construction Type to be applied to entire building</description>
+      <type>Choice</type>
+      <required>true</required>
+      <model_dependent>false</model_dependent>
+      <default_value>Inferred</default_value>
+      <choices>
+        <choice>
+          <value>Mass</value>
+          <display_name>Mass</display_name>
+        </choice>
+        <choice>
+          <value>Metal Building</value>
+          <display_name>Metal Building</display_name>
+        </choice>
+        <choice>
+          <value>SteelFramed</value>
+          <display_name>SteelFramed</display_name>
+        </choice>
+        <choice>
+          <value>WoodFramed</value>
+          <display_name>WoodFramed</display_name>
+        </choice>
+        <choice>
+          <value>Inferred</value>
+          <display_name>Inferred</display_name>
+        </choice>
+      </choices>
+    </argument>
     <argument>
       <name>add_space_type_loads</name>
       <display_name>Add Space Type Loads to Model</display_name>
@@ -1024,6 +1075,8 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>8</default_value>
+      <min_value>0.000000</min_value>
+      <max_value>24.000000</max_value>
     </argument>
     <argument>
       <name>wkdy_op_hrs_duration</name>
@@ -1034,6 +1087,8 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>8</default_value>
+      <min_value>0.000000</min_value>
+      <max_value>24.000000</max_value>
     </argument>
     <argument>
       <name>modify_wknd_op_hrs</name>
@@ -1063,6 +1118,8 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>8</default_value>
+      <min_value>0.000000</min_value>
+      <max_value>24.000000</max_value>
     </argument>
     <argument>
       <name>wknd_op_hrs_duration</name>
@@ -1073,6 +1130,8 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>8</default_value>
+      <min_value>0.000000</min_value>
+      <max_value>24.000000</max_value>
     </argument>
     <argument>
       <name>unmet_hours_tolerance</name>
@@ -1082,6 +1141,7 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>1</default_value>
+      <min_value>0.000000</min_value>
     </argument>
     <argument>
       <name>remove_objects</name>
@@ -1195,16 +1255,51 @@
   </attributes>
   <files>
     <file>
-      <filename>measure_test.osw</filename>
-      <filetype>osw</filetype>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>9ADF8B4B</checksum>
+    </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>BDCE44E6</checksum>
+    </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>2.0.0</identifier>
+        <min_compatible>3.8.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>A5493DC2</checksum>
+    </file>
+    <file>
+      <filename>Model.hvac.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>3F3371D0</checksum>
+    </file>
+    <file>
+      <filename>GenericGbxml.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>6DB338FC</checksum>
+      <checksum>E27658D5</checksum>
     </file>
     <file>
-      <filename>SmallOffice.osm</filename>
+      <filename>LargeOffice04.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>519B22EB</checksum>
+      <checksum>5415617A</checksum>
     </file>
     <file>
       <filename>MidriseApartment.osm</filename>
@@ -1213,10 +1308,10 @@
       <checksum>EB7A2671</checksum>
     </file>
     <file>
-      <filename>LargeOffice04.osm</filename>
+      <filename>SmallOffice.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>5415617A</checksum>
+      <checksum>519B22EB</checksum>
     </file>
     <file>
       <filename>USA_TX_Houston-Bush.Intercontinental.AP.722430_TMY3.epw</filename>
@@ -1224,12 +1319,6 @@
       <usage_type>test</usage_type>
       <checksum>EE565FCC</checksum>
     </file>
-    <file>
-      <filename>asm.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>C927EDEB</checksum>
-    </file>
     <file>
       <filename>USA_TX_Houston-Bush.Intercontinental.AP.722430_TMY3.epw</filename>
       <filetype>epw</filetype>
@@ -1237,10 +1326,16 @@
       <checksum>EE565FCC</checksum>
     </file>
     <file>
-      <filename>GenericGbxml.osm</filename>
+      <filename>asm.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>E27658D5</checksum>
+      <checksum>C927EDEB</checksum>
+    </file>
+    <file>
+      <filename>create_typical_doe_building_from_model_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E45BEF73</checksum>
     </file>
     <file>
       <filename>ecc.osm</filename>
@@ -1296,6 +1391,18 @@
       <usage_type>test</usage_type>
       <checksum>A03CF17A</checksum>
     </file>
+    <file>
+      <filename>measure_test.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6DB338FC</checksum>
+    </file>
+    <file>
+      <filename>measure_test_hvac.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>754E2772</checksum>
+    </file>
     <file>
       <filename>mfm.osm</filename>
       <filetype>osm</filetype>
@@ -1380,52 +1487,5 @@
       <usage_type>test</usage_type>
       <checksum>F22DEFBC</checksum>
     </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>BDCE44E6</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
-    <file>
-      <filename>Model.hvac.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>3F3371D0</checksum>
-    </file>
-    <file>
-      <filename>create_typical_doe_building_from_model_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E45BEF73</checksum>
-    </file>
-    <file>
-      <filename>measure_test_hvac.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>754E2772</checksum>
-    </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>2.0.0</identifier>
-        <min_compatible>3.0.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>8270883B</checksum>
-    </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>286621F3</checksum>
-    </file>
   </files>
 </measure>

data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb

@@ -16,15 +16,6 @@
 class DEERSpaceTypeAndConstructionSetWizard < OpenStudio::Measure::ModelMeasure
   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'
-
-  # resource files used by measure
-  include OsLib_HelperMethods
-  include OsLib_ModelGeneration
-
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
@@ -46,21 +37,21 @@ class DEERSpaceTypeAndConstructionSetWizard < OpenStudio::Measure::ModelMeasure
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # Make an argument for the building type
-    building_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('building_type', get_deer_building_types, true)
+    building_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('building_type', OpenstudioStandards::CreateTypical.get_deer_building_types, true)
     building_type.setDisplayName('Building Type.')
-    building_type.setDefaultValue('SmallOffice')
+    building_type.setDefaultValue('Asm')
     args << building_type
 
     # Make an argument for the template
-    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_deer_templates, true)
+    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', OpenstudioStandards::CreateTypical.get_deer_templates, true)
     template.setDisplayName('Template.')
-    template.setDefaultValue('90.1-2010')
+    template.setDefaultValue('DEER 2017')
     args << template
 
     # Make an argument for the climate zone
-    climate_zone = OpenStudio::Measure::OSArgument.makeChoiceArgument('climate_zone', get_deer_climate_zones, true)
+    climate_zone = OpenStudio::Measure::OSArgument.makeChoiceArgument('climate_zone', OpenstudioStandards::CreateTypical.get_deer_climate_zones, true)
     climate_zone.setDisplayName('Climate Zone.')
-    climate_zone.setDefaultValue('ASHRAE 169-2013-2A')
+    climate_zone.setDefaultValue('CEC T24-CEC8')
     args << climate_zone
 
     # make an argument to add new space types
@@ -88,7 +79,13 @@ class DEERSpaceTypeAndConstructionSetWizard < OpenStudio::Measure::ModelMeasure
   def run(model, runner, user_arguments)
     super(model, runner, user_arguments)
 
-    results = wizard(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
+
+    # run create_space_types_and_constructions
+    results = OpenstudioStandards::CreateTypical.create_space_types_and_constructions(model, args['building_type'], args['template'], args['climate_zone'])
 
     if results == false
       return false