openstudio-model-articulation 0.9.0 → 0.11.0

data/lib/measures/create_bar_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_bar_from_model</name>
   <uid>87fb0783-7a38-4900-8969-40e744c67814</uid>
-  <version_id>e85f311a-3484-489c-9ccf-4a79ead0cab9</version_id>
-  <version_modified>20230602T160046Z</version_modified>
+  <version_id>8dd3e173-1aa6-40e7-a97e-0c1acd10f3b2</version_id>
+  <version_modified>2024-11-16T23:56:37Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>CreateBarFromModel</class_name>
   <display_name>Create Bar From Model</display_name>
@@ -84,6 +84,41 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>8696A072</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>5E470ADB</checksum>
+    </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</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>87BC1C23</checksum>
+    </file>
+    <file>
+      <filename>create_bar_from_model_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>7344F69A</checksum>
+    </file>
     <file>
       <filename>example_model.osm</filename>
       <filetype>osm</filetype>
@@ -114,12 +149,6 @@
       <usage_type>test</usage_type>
       <checksum>CD0671DC</checksum>
     </file>
-    <file>
-      <filename>sliver_start.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>9D5BDAC4</checksum>
-    </file>
     <file>
       <filename>sliver_multiplier.osm</filename>
       <filetype>osm</filetype>
@@ -127,39 +156,10 @@
       <checksum>FF077DA0</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>5E470ADB</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <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.0.0</identifier>
-        <min_compatible>3.0.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>27B22ECF</checksum>
-    </file>
-    <file>
-      <filename>create_bar_from_model_test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>sliver_start.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>7344F69A</checksum>
+      <checksum>9D5BDAC4</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/create_bar_from_space_type_ratios/LICENSE.md

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

data/lib/measures/create_bar_from_space_type_ratios/README.md

@@ -306,7 +306,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", "NREL ZNE Ready 2017", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020", "DEER 2025", "DEER 2030", "DEER 2035", "DEER 2040", "DEER 2045", "DEER 2050", "DEER 2055", "DEER 2060", "DEER 2065", "DEER 2070", "DEER 2075"]
+**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", "NREL ZNE Ready 2017", "DEER Pre-1975", "DEER 1985", "DEER 1996", "DEER 2003", "DEER 2007", "DEER 2011", "DEER 2014", "DEER 2015", "DEER 2017", "DEER 2020", "DEER 2025", "DEER 2030", "DEER 2035", "DEER 2040", "DEER 2045", "DEER 2050", "DEER 2055", "DEER 2060", "DEER 2065", "DEER 2070", "DEER 2075", "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"]
 
 
 ### Space Type Ratios String

data/lib/measures/create_bar_from_space_type_ratios/measure.rb

@@ -14,20 +14,8 @@
 
 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_geometry'
-require 'openstudio/extension/core/os_lib_model_generation'
-require 'openstudio/extension/core/os_lib_model_simplification'
-
 # start the measure
 class CreateBarFromSpaceTypeRatios < OpenStudio::Measure::ModelMeasure
-  # resource file modules
-  include OsLib_HelperMethods
-  include OsLib_Geometry
-  include OsLib_ModelGeneration
-  include OsLib_ModelSimplification
 
   # 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
@@ -50,11 +38,81 @@ class CreateBarFromSpaceTypeRatios < OpenStudio::Measure::ModelMeasure
     return 'Envelope.Form'
   end
 
+    # remove existing non resource objects from the model
+  # technically thermostats and building stories are resources but still want to remove them.
+  def remove_non_resource_objects(runner, model, options = nil)
+    if options.nil?
+      options = {}
+      options[:remove_building_stories] = true
+      options[:remove_thermostats] = true
+      options[:remove_air_loops] = true
+      options[:remove_non_swh_plant_loops] = true
+
+      # leave these in by default unless requsted when method called
+      options[:remove_swh_plant_loops] = false
+      options[:remove_exterior_lights] = false
+      options[:remove_site_shading] = false
+    end
+
+    num_model_objects = model.objects.size
+
+    # remove non-resource objects not removed by removing the building
+    if options[:remove_building_stories] then model.getBuildingStorys.each(&:remove) end
+    if options[:remove_thermostats] then model.getThermostats.each(&:remove) end
+    if options[:remove_air_loops] then model.getAirLoopHVACs.each(&:remove) end
+    if options[:remove_exterior_lights] then model.getFacility.exteriorLights.each(&:remove) end
+    if options[:remove_site_shading] then model.getSite.shadingSurfaceGroups.each(&:remove) end
+
+    # see if plant loop is swh or not and take proper action (booter loop doesn't have water use equipment)
+    model.getPlantLoops.each do |plant_loop|
+      is_swh_loop = false
+      plant_loop.supplyComponents.each do |component|
+        if component.to_WaterHeaterMixed.is_initialized
+          is_swh_loop = true
+          next
+        end
+      end
+
+      if is_swh_loop
+        if options[:remove_swh_plant_loops] then plant_loop.remove end
+      else
+        if options[:remove_non_swh_plant_loops] then plant_loop.remove end
+      end
+    end
+
+    # remove water use connections (may be removed when loop is removed)
+    if options[:remove_swh_plant_loops] then model.getWaterConnectionss.each(&:remove) end
+    if options[:remove_swh_plant_loops] then model.getWaterUseEquipments.each(&:remove) end
+
+    # remove building but reset fields on new building object.
+    building_fields = []
+    building = model.getBuilding
+    num_fields = building.numFields
+    num_fields.times.each do |i|
+      building_fields << building.getString(i).get
+    end
+    # removes spaces, space's child objects, thermal zones, zone equipment, non site surfaces, building stories and water use connections.
+    model.getBuilding.remove
+    building = model.getBuilding
+    num_fields.times.each do |i|
+      next if i == 0 # don't try and set handle
+      building_fields << building.setString(i, building_fields[i])
+    end
+
+    # other than optionally site shading and exterior lights not messing with site characteristics
+
+    if num_model_objects - model.objects.size > 0
+      runner.registerInfo("Removed #{num_model_objects - model.objects.size} non resource objects from the model.")
+    end
+
+    return true
+  end
+
   def arguments(model)
     args = OpenStudio::Measure::OSArgumentVector.new
 
     # Make argument for template
-    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', get_templates(true), true) # setting up measure to list all templates, but space types in string should all come from one
+    template = OpenStudio::Measure::OSArgument.makeChoiceArgument('template', OpenstudioStandards::CreateTypical.get_templates(true), true) # setting up measure to list all templates, but space types in string should all come from one
     template.setDisplayName('Target Standard')
     template.setDefaultValue('90.1-2004')
     args << template
@@ -121,6 +179,7 @@ class CreateBarFromSpaceTypeRatios < OpenStudio::Measure::ModelMeasure
     ns_to_ew_ratio.setDisplayName('Ratio of North/South Facade Length Relative to East/West Facade Length')
     ns_to_ew_ratio.setDescription('Selecting an aspect ratio of 0 will trigger a smart building type default. Aspect ratios less than one are not recommended for sliced bar geometry, instead rotate building and use a greater than 1 aspect ratio.')
     ns_to_ew_ratio.setDefaultValue(0.0)
+    ns_to_ew_ratio.setMinValue(0.0)
     args << ns_to_ew_ratio
 
     # Make argument for perim_mult
@@ -270,8 +329,29 @@ class CreateBarFromSpaceTypeRatios < 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_sym, 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
+
+    # remove_non_resource_objects (this was not moved to standards, so added method in measure for now)
+    remove_non_resource_objects(runner, model)
+
     # method run from os_lib_model_generation.rb
-    result = bar_from_space_type_ratios(model, runner, user_arguments)
+    result = OpenstudioStandards::Geometry.create_bar_from_space_type_ratios(model, args)
+
+    # gather log
+    log_messages_to_runner(runner, debug)
+    reset_log
 
     if result == false
       return false

data/lib/measures/create_bar_from_space_type_ratios/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_bar_from_space_type_ratios</name>
   <uid>3e988765-9673-46f8-9b65-99d5b86c2b22</uid>
-  <version_id>6fb5acb9-3669-4eca-ad02-cc1eacd619c5</version_id>
-  <version_modified>20230602T160047Z</version_modified>
+  <version_id>3220d2d2-1d1b-465c-92ba-bd0fa5ea83d8</version_id>
+  <version_modified>2024-11-16T23:56:38Z</version_modified>
   <xml_checksum>49BEF039</xml_checksum>
   <class_name>CreateBarFromSpaceTypeRatios</class_name>
   <display_name>Create Bar From Space Type Ratios</display_name>
@@ -171,6 +171,46 @@
           <value>DEER 2075</value>
           <display_name>DEER 2075</display_name>
         </choice>
+        <choice>
+          <value>ComStock DEER Pre-1975</value>
+          <display_name>ComStock DEER Pre-1975</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 1985</value>
+          <display_name>ComStock DEER 1985</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 1996</value>
+          <display_name>ComStock DEER 1996</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2003</value>
+          <display_name>ComStock DEER 2003</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2007</value>
+          <display_name>ComStock DEER 2007</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2011</value>
+          <display_name>ComStock DEER 2011</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2014</value>
+          <display_name>ComStock DEER 2014</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2015</value>
+          <display_name>ComStock DEER 2015</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2017</value>
+          <display_name>ComStock DEER 2017</display_name>
+        </choice>
+        <choice>
+          <value>ComStock DEER 2020</value>
+          <display_name>ComStock DEER 2020</display_name>
+        </choice>
       </choices>
     </argument>
     <argument>
@@ -264,6 +304,7 @@
       <required>true</required>
       <model_dependent>false</model_dependent>
       <default_value>0</default_value>
+      <min_value>0.000000</min_value>
     </argument>
     <argument>
       <name>perim_mult</name>
@@ -531,16 +572,28 @@
   </attributes>
   <files>
     <file>
-      <filename>basement.png</filename>
-      <filetype>png</filetype>
-      <usage_type>doc</usage_type>
-      <checksum>6436A0E2</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>8696A072</checksum>
     </file>
     <file>
-      <filename>custom_height_false.png</filename>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>6BF1D1B6</checksum>
+    </file>
+    <file>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>0BC848FD</checksum>
+    </file>
+    <file>
+      <filename>ar_05.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>0684A3AD</checksum>
+      <checksum>A86ECE4C</checksum>
     </file>
     <file>
       <filename>ar_1.png</filename>
@@ -549,64 +602,64 @@
       <checksum>F5818F2F</checksum>
     </file>
     <file>
-      <filename>sep_3.png</filename>
+      <filename>ar_2.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>4DE3ED94</checksum>
+      <checksum>1CAF9C96</checksum>
     </file>
     <file>
-      <filename>custom_height_true.png</filename>
+      <filename>bar_double_loaded.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>37DBC088</checksum>
+      <checksum>29AECFF4</checksum>
     </file>
     <file>
-      <filename>ar_2.png</filename>
+      <filename>bar_single_core_perim.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>1CAF9C96</checksum>
+      <checksum>D1ED9343</checksum>
     </file>
     <file>
-      <filename>wwr_custom.png</filename>
+      <filename>bar_sliced_indiv.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>D1E7B644</checksum>
+      <checksum>B737F7E5</checksum>
     </file>
     <file>
-      <filename>perim_mult_2010.png</filename>
+      <filename>bar_sliced_simple.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>7704044F</checksum>
+      <checksum>EF138637</checksum>
     </file>
     <file>
-      <filename>perim_mult_2012.png</filename>
+      <filename>basement.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>8809F075</checksum>
+      <checksum>6436A0E2</checksum>
     </file>
     <file>
-      <filename>ar_05.png</filename>
+      <filename>custom_height_false.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>A86ECE4C</checksum>
+      <checksum>0684A3AD</checksum>
     </file>
     <file>
-      <filename>party.png</filename>
+      <filename>custom_height_true.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>B70845E6</checksum>
+      <checksum>37DBC088</checksum>
     </file>
     <file>
-      <filename>bar_sliced_simple.png</filename>
+      <filename>no_party_mult.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>EF138637</checksum>
+      <checksum>E68AC690</checksum>
     </file>
     <file>
-      <filename>bar_single_core_perim.png</filename>
+      <filename>party.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>D1ED9343</checksum>
+      <checksum>B70845E6</checksum>
     </file>
     <file>
       <filename>party_multi.png</filename>
@@ -615,40 +668,40 @@
       <checksum>1CA071B4</checksum>
     </file>
     <file>
-      <filename>sep_05.png</filename>
+      <filename>perim_mult_2010.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>86E7AC6E</checksum>
+      <checksum>7704044F</checksum>
     </file>
     <file>
-      <filename>sep_10.png</filename>
+      <filename>perim_mult_2012.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>91062F24</checksum>
+      <checksum>8809F075</checksum>
     </file>
     <file>
-      <filename>bar_sliced_indiv.png</filename>
+      <filename>perim_mult_2020.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>B737F7E5</checksum>
+      <checksum>0925C42D</checksum>
     </file>
     <file>
-      <filename>no_party_mult.png</filename>
+      <filename>sep_05.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>E68AC690</checksum>
+      <checksum>86E7AC6E</checksum>
     </file>
     <file>
-      <filename>bar_double_loaded.png</filename>
+      <filename>sep_10.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>29AECFF4</checksum>
+      <checksum>91062F24</checksum>
     </file>
     <file>
-      <filename>perim_mult_2020.png</filename>
+      <filename>sep_3.png</filename>
       <filetype>png</filetype>
       <usage_type>doc</usage_type>
-      <checksum>0925C42D</checksum>
+      <checksum>4DE3ED94</checksum>
     </file>
     <file>
       <filename>story_sort.png</filename>
@@ -657,39 +710,27 @@
       <checksum>A64E1184</checksum>
     </file>
     <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>0BC848FD</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
-    <file>
-      <filename>create_bar_from_space_type_ratios_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>0A68D7F4</checksum>
+      <filename>wwr_custom.png</filename>
+      <filetype>png</filetype>
+      <usage_type>doc</usage_type>
+      <checksum>D1E7B644</checksum>
     </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
         <identifier>2.0.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>50E9C4CF</checksum>
+      <checksum>57CFCE32</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>2D2741A8</checksum>
+      <filename>create_bar_from_space_type_ratios_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>0A68D7F4</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/create_baseline_building/LICENSE.md

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

data/lib/measures/create_baseline_building/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_baseline_building</name>
   <uid>4de56e21-b6cd-45d9-8466-862507d228b2</uid>
-  <version_id>0dccce6b-f4a7-4c52-ae85-647de50fcd21</version_id>
-  <version_modified>20230602T160041Z</version_modified>
+  <version_id>fff85669-8136-4b9c-9c2d-459678c195af</version_id>
+  <version_modified>2024-11-16T23:56:33Z</version_modified>
   <xml_checksum>A514F332</xml_checksum>
   <class_name>CreateBaselineBuilding</class_name>
   <display_name>Create Baseline Building</display_name>
@@ -230,28 +230,10 @@
   </attributes>
   <files>
     <file>
-      <filename>SmallOffice-90.1-2007-ASHRAE 169-2006-2A.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>6BED784B</checksum>
-    </file>
-    <file>
-      <filename>SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F8619A70</checksum>
-    </file>
-    <file>
-      <filename>USA_TX_Houston-Bush.Intercontinental.AP.722430_TMY3.epw</filename>
-      <filetype>epw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>EE565FCC</checksum>
-    </file>
-    <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>8696A072</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -260,16 +242,10 @@
       <checksum>8214DE01</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
-    <file>
-      <filename>create_baseline_building_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>8731D1E6</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -282,5 +258,29 @@
       <usage_type>script</usage_type>
       <checksum>E531AD7F</checksum>
     </file>
+    <file>
+      <filename>SecondarySchool-DOE Ref Pre-1980-ASHRAE 169-2006-2A.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F8619A70</checksum>
+    </file>
+    <file>
+      <filename>SmallOffice-90.1-2007-ASHRAE 169-2006-2A.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>6BED784B</checksum>
+    </file>
+    <file>
+      <filename>USA_TX_Houston-Bush.Intercontinental.AP.722430_TMY3.epw</filename>
+      <filetype>epw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EE565FCC</checksum>
+    </file>
+    <file>
+      <filename>create_baseline_building_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>8731D1E6</checksum>
+    </file>
   </files>
 </measure>