openstudio-model-articulation 0.4.0 → 0.6.1

data/lib/measures/blended_space_type_from_model/measure.rb

@@ -38,7 +38,7 @@
 
 # load OpenStudio measure libraries from openstudio-extension gem
 require 'openstudio-extension'
-require 'openstudio/extension/core/os_lib_model_simplification.rb'
+require 'openstudio/extension/core/os_lib_model_simplification'
 
 # start the measure
 class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
@@ -96,7 +96,8 @@ class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
 
     # divide the building up based on blend method
     space_type_hash = {}
-    if blend_method == 'Building Type'
+    case blend_method
+    when 'Building Type'
 
       # loop through spaces and organize by building type
       model.getSpaceTypes.each do |space_type|
@@ -117,7 +118,7 @@ class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
         space_type_hash[building_type] << space_type
       end
 
-    elsif blend_method == 'Building Story'
+    when 'Building Story'
 
       # loop through building stories
       model.getBuildingStorys.sort.each do |story|
@@ -165,6 +166,7 @@ class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
       # warn if spaces in model that are not on building story (re-assign to cloned space type)
       model.getSpaces.each do |space|
         next if space.buildingStory.is_initialized
+
         runner.registerWarning("#{space.name} is not assigned to a building story. It will be ignored.")
       end
 
@@ -176,13 +178,16 @@ class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
     initial_cond_space_type_hash = {}
     model.getSpaceTypes.sort.each do |space_type|
       next if space_type.floorArea == 0
+
       floor_area_si = 0
       # loop through spaces so I can skip if not included in floor area
       space_type.spaces.each do |space|
         next if !space.partofTotalFloorArea
+
         floor_area_si += space.floorArea * space.multiplier
       end
       next if floor_area_si == 0
+
       initial_cond_space_type_hash[space_type] = floor_area_si
     end
     runner.registerInitialCondition("The initial building uses #{initial_cond_space_type_hash.size} spaces types.")
@@ -195,13 +200,16 @@ class BlendedSpaceTypeFromModel < OpenStudio::Measure::ModelMeasure
     final_cond_space_type_hash = {}
     model.getSpaceTypes.sort.each do |space_type|
       next if space_type.floorArea == 0
+
       floor_area_si = 0
       # loop through spaces so I can skip if not included in floor area
       space_type.spaces.each do |space|
         next if !space.partofTotalFloorArea
+
         floor_area_si += space.floorArea * space.multiplier
       end
       next if floor_area_si == 0
+
       final_cond_space_type_hash[space_type] = floor_area_si
     end
     runner.registerFinalCondition("The final building uses #{final_cond_space_type_hash.size} spaces types.")

data/lib/measures/blended_space_type_from_model/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>blended_space_type_from_model</name>
   <uid>667c2f1f-0927-4dbd-a7be-1087b5c15181</uid>
-  <version_id>2ee4ffb6-cb22-4420-b340-1e0aefeb70fb</version_id>
-  <version_modified>20210423T142526Z</version_modified>
+  <version_id>68180f3a-0d37-4921-8eea-baab050bb62b</version_id>
+  <version_modified>20220512T054947Z</version_modified>
   <xml_checksum>28AD5222</xml_checksum>
   <class_name>BlendedSpaceTypeFromModel</class_name>
   <display_name>Blended Space Type from Model</display_name>
@@ -96,12 +96,6 @@
       <usage_type>test</usage_type>
       <checksum>F1C3606F</checksum>
     </file>
-    <file>
-      <filename>replace_occupied_spaces_with_blended_space_type_design_doc.txt</filename>
-      <filetype>txt</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>C2673B6F</checksum>
-    </file>
     <file>
       <filename>large_hotel_restaurant_from_create_typical.osm</filename>
       <filetype>osm</filetype>
@@ -132,18 +126,24 @@
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>os_lib_model_simplification.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>026886BB</checksum>
-    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
       <checksum>A21A3ED2</checksum>
     </file>
+    <file>
+      <filename>replace_occupied_spaces_with_blended_space_type_design_doc.txt</filename>
+      <filetype>txt</filetype>
+      <usage_type>doc</usage_type>
+      <checksum>C2673B6F</checksum>
+    </file>
+    <file>
+      <filename>measure_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>60597097</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -153,13 +153,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7C94729F</checksum>
-    </file>
-    <file>
-      <filename>measure_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>28954A91</checksum>
+      <checksum>556BD210</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/clone_building_from_external_model/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>clone_building_from_external_model</name>
   <uid>09711168-01a7-4abc-b710-b49d59d927d8</uid>
-  <version_id>c5085191-28b7-4dec-a425-d5af83949797</version_id>
-  <version_modified>20210423T142527Z</version_modified>
+  <version_id>444db266-08fc-4c5f-9c49-0153dde8d053</version_id>
+  <version_modified>20220505T182930Z</version_modified>
   <xml_checksum>AFECFDDF</xml_checksum>
   <class_name>CloneBuildingFromExternalModel</class_name>
   <display_name>Clone Building From External Model</display_name>
@@ -114,7 +114,7 @@
       <filename>clone_building_from_external_model_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>C4490998</checksum>
+      <checksum>D9BEC6C9</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/create_DOE_prototype_building/measure.rb

@@ -204,7 +204,7 @@ class CreateDOEPrototypeBuilding < OpenStudio::Measure::ModelMeasure
     reset_log
 
     return true
-  end # end the run method
+  end
 
   # Get all the log messages and put into output
   # for users to see.
@@ -233,7 +233,7 @@ class CreateDOEPrototypeBuilding < OpenStudio::Measure::ModelMeasure
     end
     @runner.registerInfo("Total Time = #{(Time.new - @start_time).round}sec.")
   end
-end # end the measure
+end
 
 # this allows the measure to be use by the application
 CreateDOEPrototypeBuilding.new.registerWithApplication