openstudio-model-articulation 0.4.0 → 0.6.1

data/lib/measures/SetWindowToWallRatioByFacade/resources/functions.rb

@@ -0,0 +1,176 @@
+# *******************************************************************************
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
+# All rights reserved.
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
+# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
+# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
+
+require 'openstudio'
+
+module Functions
+  # return an array of surfaces or subsurfaces from a specific facade.
+  def self.get_surfaces_or_subsurfaces_by_facade(surfaces_or_subsurfaces, facade)
+    surfaces_or_subsurfaces_by_facade = []
+
+    surfaces_or_subsurfaces.each do |surface_or_subsurface|
+      case surface_or_subsurface.class.to_s.gsub('OpenStudio::Model::', '')
+      when 'Surface'
+        next if surface_or_subsurface.surfaceType != 'Wall'
+        next if surface_or_subsurface.outsideBoundaryCondition != 'Outdoors'
+
+        if surface_or_subsurface.space.empty?
+          runner.registerWarning("#{surface_or_subsurface.name} doesn't have a parent space and won't be included in the measure reporting or modifications.")
+          next
+        end
+        direction_of_relative_north = surface_or_subsurface.space.get.directionofRelativeNorth
+      when 'SubSurface'
+        next if surface_or_subsurface.subSurfaceType == 'Door' || surface_or_subsurface.subSurfaceType == 'OverheadDoor'
+
+        direction_of_relative_north = surface_or_subsurface.surface.get.space.get.directionofRelativeNorth
+      end
+
+      # get the absoluteAzimuth for the surface so we can categorize it
+      absoluteAzimuth = OpenStudio.convert(surface_or_subsurface.azimuth, 'rad', 'deg').get + direction_of_relative_north + surface_or_subsurface.model.getBuilding.northAxis
+      absoluteAzimuth -= 360.0 until absoluteAzimuth < 360.0
+
+      case facade
+      when 'North'
+        next if !((absoluteAzimuth >= 315.0) || (absoluteAzimuth < 45.0))
+      when 'East'
+        next if !((absoluteAzimuth >= 45.0) && (absoluteAzimuth < 135.0))
+      when 'South'
+        next if !((absoluteAzimuth >= 135.0) && (absoluteAzimuth < 225.0))
+      when 'West'
+        next if !((absoluteAzimuth >= 225.0) && (absoluteAzimuth < 315.0))
+      when 'All'
+        # no next needed
+      else
+        runner.registerError("Unexpected value of facade: #{facade}.")
+        return false
+      end
+
+      surfaces_or_subsurfaces_by_facade << surface_or_subsurface
+    end
+
+    return surfaces_or_subsurfaces_by_facade
+  end
+
+  # return a hash of subsurface constructions.
+  def self.get_orig_sub_surf_const_for_target(subsurfaces)
+    orig_sub_surf_const_for_target = {}
+
+    subsurfaces.each do |subsurface|
+      next if subsurface.subSurfaceType == 'Door' || subsurface.subSurfaceType == 'OverheadDoor'
+
+      if subsurface.construction.is_initialized
+        if orig_sub_surf_const_for_target.key?(subsurface.construction.get)
+          orig_sub_surf_const_for_target[subsurface.construction.get] += 1
+        else
+          orig_sub_surf_const_for_target[subsurface.construction.get] = 1
+        end
+      end
+    end
+
+    return orig_sub_surf_const_for_target
+  end
+
+  # see if surface is rectangular (only checking non rotated on vertical wall)
+  # todo - add in more robust rectangle check that can look for rotate and tilted rectangles
+  def self.rectangle?(surface)
+    x_vals = []
+    y_vals = []
+    z_vals = []
+    vertices = surface.vertices
+    vertices.each do |vertex|
+      # initialize new vertex to old vertex
+      # rounding values to address tolerance issue 10 digits digits in
+      x_vals << vertex.x.round(4)
+      y_vals << vertex.y.round(4)
+      z_vals << vertex.z.round(4)
+    end
+    if x_vals.uniq.size <= 2 && y_vals.uniq.size <= 2 && z_vals.uniq.size <= 2
+      return true
+    else
+      return false
+    end
+  end
+
+  # return true if the requested window-to-wall area exceeds the maximum allowed area, false if not.
+  # implements the following part of the applyViewAndDaylightingGlassRatios method, which is what setWindowToWallRatio uses.
+  # https://github.com/NREL/OpenStudio/blob/760613c7ac9c2093f7dbd65f947a6853356c558d/src/utilities/geometry/Geometry.cpp#L605-L695
+  def self.requested_window_area_greater_than_max?(surface, viewGlassToWallRatio)
+    daylightingGlassToWallRatio = 0
+    totalWWR = viewGlassToWallRatio + daylightingGlassToWallRatio
+
+    vertices = surface.vertices
+    transformation = OpenStudio::Transformation.alignFace(vertices)
+    faceVertices = transformation.inverse * vertices
+
+    # // new coordinate system has z' in direction of outward normal, y' is up
+    xmin = 0
+    xmax = 0
+    ymin = 0
+    ymax = 0
+    faceVertices.each do |faceVertex|
+      xmin = [xmin, faceVertex.x].min
+      xmax = [xmax, faceVertex.x].max
+      ymin = [ymin, faceVertex.y].min
+      ymax = [ymax, faceVertex.y].max
+    end
+
+    oneInch = 0.0254 # meters
+
+    # // DLM: preserve a 1" gap between window and edge to keep SketchUp happy
+    minGlassToEdgeDistance = oneInch
+    minViewToDaylightDistance = 0
+
+    # // wall parameters
+    wallWidth = xmax - xmin
+    wallHeight = ymax - ymin
+    wallArea = wallWidth * wallHeight
+
+    # return false if wallWidth < 2 * minGlassToEdgeDistance
+
+    # return false if wallHeight < 2 * minGlassToEdgeDistance + minViewToDaylightDistance
+
+    maxWindowArea = wallArea - 2 * wallHeight * minGlassToEdgeDistance
+    - (wallWidth - 2 * minGlassToEdgeDistance) * (2 * minGlassToEdgeDistance + minViewToDaylightDistance)
+    requestedViewArea = viewGlassToWallRatio * wallArea
+    requestedDaylightingArea = daylightingGlassToWallRatio * wallArea
+    requestedTotalWindowArea = totalWWR * wallArea
+
+    if requestedTotalWindowArea > maxWindowArea
+      return true
+    else
+      return false
+    end
+  end
+end

data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb

@@ -45,7 +45,7 @@
 # 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.rb'
+require 'openstudio/extension/core/os_lib_geometry'
 
 # load OpenStudio measure libraries
 require "#{File.dirname(__FILE__)}/resources/os_lib_cofee"
@@ -137,6 +137,7 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
     spaceTypes = model.getSpaceTypes
     spaceTypes.each do |spaceType|
       next if spaceType.spaces.empty?
+
       result = OsLib_HelperMethods.getAreaOfSpacesInArray(model, spaceType.spaces, areaType = 'floorArea')
       spaceTypeHash[spaceType] = result['totalArea']
       totalSpaceTypeArea += result['totalArea']
@@ -144,7 +145,7 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
 
     runner.registerInfo("Initial Space Type Total Floor Area is #{OsLib_HelperMethods.neatConvertWithUnitDisplay(totalSpaceTypeArea, 'm^2', 'ft^2', 0, unitBefore = false, unitAfter = true, space = true, parentheses = true)}.")
 
-    spaceTypeHash.sort_by { |key, value| value }.reverse.each do |k, v|
+    spaceTypeHash.sort_by { |key, value| value }.reverse_each do |k, v|
       runner.registerInfo("Floor Area for #{k.name} is  #{OsLib_HelperMethods.neatConvertWithUnitDisplay(v, 'm^2', 'ft^2', 0, unitBefore = false, unitAfter = true, space = true, parentheses = true)}.")
     end
 
@@ -194,7 +195,8 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
     runner.registerInfo("Bounding box area is #{areaBounding_display}. #{lengthX_display} by #{lengthY_display}.")
 
     # get target footprint size
-    if logic == 'Maintain Bounding Box Aspect Ratio'
+    case logic
+    when 'Maintain Bounding Box Aspect Ratio'
       areaTarget = totalFloorArea / numStories
       areaMultiplier = areaTarget / areaBounding
       edgeMultiplier = Math.sqrt(areaMultiplier)
@@ -204,7 +206,7 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
       # run def to create bar
       bar_AspectRatio = OsLib_Cofee.createBar(model, spaceTypeHash, lengthXTarget, lengthYTarget, totalFloorArea, numStories, midFloorMultiplier, xmin, ymin, lengthX, lengthY, zmin, zmax, true)
 
-    elsif logic == 'Maintain Total Exterior Wall Area'
+    when 'Maintain Total Exterior Wall Area'
       areaTarget = totalFloorArea / numStories
       perim = exteriorArea_si / (zmax - zmin)
       lengthYTarget = 0.25 * perim - 0.25 * Math.sqrt(perim**2 - 16 * areaTarget)
@@ -229,6 +231,7 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
           relativeAzimuth = OpenStudio.convert(surface.azimuth, 'rad', 'deg').get
           next if surface.outsideBoundaryCondition != 'Outdoors'
           next if surface.surfaceType != 'Wall'
+
           if (relativeAzimuth.round == 90) || (relativeAzimuth.round == 270)
             construction = surface.construction # TODO: - this isn't really the construction I want since it wasn't an interior one, but will work for now
             surface.setOutsideBoundaryCondition('Adiabatic')
@@ -257,6 +260,7 @@ class SimplifyGeometryToSlicedBar < OpenStudio::Measure::ModelMeasure
           relativeAzimuth = OpenStudio.convert(surface.azimuth, 'rad', 'deg').get
           next if surface.outsideBoundaryCondition != 'Outdoors'
           next if surface.surfaceType != 'Wall'
+
           if (relativeAzimuth.round == 90) || (relativeAzimuth.round == 270)
             construction = surface.construction # TODO: - this isn't really the construction I want since it wasn't an interior one, but will work for now
             surface.setOutsideBoundaryCondition('Adiabatic')

data/lib/measures/SimplifyGeometryToSlicedBar/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>simplify_geometry_to_sliced_bar</name>
   <uid>eb218516-5fa5-47fe-948d-274777c7d592</uid>
-  <version_id>43464352-edbd-46d3-9feb-65ad84e6797d</version_id>
-  <version_modified>20210423T142517Z</version_modified>
+  <version_id>13960111-65c1-476c-a206-591ca7423b94</version_id>
+  <version_modified>20220505T182931Z</version_modified>
   <xml_checksum>45097B60</xml_checksum>
   <class_name>SimplifyGeometryToSlicedBar</class_name>
   <display_name>SimplifyGeometryToSlicedBar</display_name>
@@ -106,23 +106,23 @@ In a future version I may try to identify similar spaces types and blend them to
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <filename>os_lib_helper_methods.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>B91D04D5</checksum>
+      <checksum>37A1A07C</checksum>
     </file>
     <file>
       <filename>os_lib_cofee.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>BA716A1A</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>031AC395</checksum>
     </file>
     <file>
       <version>
@@ -133,19 +133,37 @@ In a future version I may try to identify similar spaces types and blend them to
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>6147FE1F</checksum>
+      <checksum>46B1D452</checksum>
     </file>
     <file>
       <filename>os_lib_geometry.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F25DC7F1</checksum>
+      <checksum>53B30D3C</checksum>
     </file>
     <file>
       <filename>SimplifyGeometryToSlicedBar_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>6BEA0A0C</checksum>
+      <checksum>A931C588</checksum>
+    </file>
+    <file>
+      <filename>UShapedHotelExample/run.db</filename>
+      <filetype>db</filetype>
+      <usage_type>test</usage_type>
+      <checksum>9230B5CD</checksum>
+    </file>
+    <file>
+      <filename>UShapedHotelExample/files/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
+      <filetype>epw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>C254B53F</checksum>
+    </file>
+    <file>
+      <filename>UShapedHotelExample/project.osp</filename>
+      <filetype>osp</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EE6FAF90</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb

@@ -46,8 +46,9 @@ module OsLib_Cofee
     # create an array to control sort order of spaces in bar
     customSpaceTypeBar = []
     counter = 0
-    spaceTypeHash.sort_by { |key, value| value }.reverse.each do |k, v|
+    spaceTypeHash.sort_by { |key, value| value }.reverse_each do |k, v|
       next if v == 0 # this line adds support for fractional values of 0
+
       if counter == 1
         if (lengthXTarget * (v / totalFloorArea) > perimeterDepth * perimeterBufferFactor) && endZones
           customSpaceTypeBar << [k, totalFloorArea * (perimeterDepth / lengthXTarget)]
@@ -63,7 +64,7 @@ module OsLib_Cofee
 
     # add the largest space type to the end
     counter = 0
-    spaceTypeHash.sort_by { |key, value| value }.reverse.each do |k, v|
+    spaceTypeHash.sort_by { |key, value| value }.reverse_each do |k, v|
       if counter == 0
         # if width is greater than 1.5x perimeter depth then split in half
         if (lengthXTarget * (v / totalFloorArea) > perimeterDepth * perimeterBufferFactor) && endZones
@@ -201,9 +202,10 @@ module OsLib_Cofee
       else
         z += floor_to_floor_height * midFloorMultiplier - floor_to_floor_height
 
-        if storyCounter == 0
+        case storyCounter
+        when 0
           ceilingAdiabatic = true
-        elsif storyCounter == 1
+        when 1
           floorAdiabatic = true
           ceilingAdiabatic = true
         else

data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb

@@ -63,7 +63,7 @@ module OsLib_Geometry
       end
 
       # set vertices to new vertices
-      surface.setVertices(newVertices) # todo check if this was made, and issue warning if it was not. Could happen if resulting surface not planer.
+      surface.setVertices(newVertices) # TODO: check if this was made, and issue warning if it was not. Could happen if resulting surface not planer.
 
       if flag then counter += 1 end
     end
@@ -95,6 +95,7 @@ module OsLib_Geometry
     floors = []
     space.surfaces.each do |surface|
       next if surface.surfaceType != 'Floor'
+
       floors << surface
     end
 
@@ -407,6 +408,7 @@ module OsLib_Geometry
           # adjustments running counter for space type being removed from this story
           space_types_running_count.each do |k2, v2|
             next if k2 != first_space[0]
+
             v2[:floor_area] += first_space[1][:floor_area] * v[:multiplier]
           end
 
@@ -504,10 +506,8 @@ module OsLib_Geometry
           re_apply_largest_space_type_at_end = true
         end
       end
-      if space_type == space_types.last[0]
-        if [length, width].max * space_type_hash[:floor_area] / total_floor_area > max_bar_end_multiplier * perimeter_zone_depth
-          end_perimeter_width_deduction = perimeter_zone_depth
-        end
+      if space_type == space_types.last[0] && ([length, width].max * space_type_hash[:floor_area] / total_floor_area > max_bar_end_multiplier * perimeter_zone_depth)
+        end_perimeter_width_deduction = perimeter_zone_depth
       end
       non_end_adjusted_width = ([length, width].max * space_type_hash[:floor_area] / total_floor_area) - start_perimeter_width_deduction - end_perimeter_width_deduction
 
@@ -772,7 +772,7 @@ module OsLib_Geometry
       if story.nil?
         story = OpenStudio::Model::BuildingStory.new(model)
         story.setNominalFloortoFloorHeight(story_data[:space_height]) # not used for anything
-        story.setNominalZCoordinate (story_data[:space_origin_z]) # not used for anything
+        story.setNominalZCoordinate(story_data[:space_origin_z]) # not used for anything
         story.setName("Story #{story_name}")
       end
 
@@ -780,11 +780,12 @@ module OsLib_Geometry
       multiplier_story_above = 1
       multiplier_story_below = 1
 
-      if index == 0 # bottom floor, only check above
+      case index
+      when 0 # bottom floor, only check above
         if story_hash.size > 1
           multiplier_story_above = story_hash.values[index + 1][:multiplier]
         end
-      elsif index == story_hash.size - 1 # top floor, check only below
+      when story_hash.size - 1 # top floor, check only below
         multiplier_story_below = story_hash.values[index + -1][:multiplier]
       else # mid floor, check above and below
         multiplier_story_above = story_hash.values[index + 1][:multiplier]
@@ -997,9 +998,11 @@ module OsLib_Geometry
     perim_story.spaces.each do |space|
       space.surfaces.each do |surface|
         next if (surface.outsideBoundaryCondition != 'Outdoors') || (surface.surfaceType != 'Wall')
+
         area = surface.grossArea
         z_value_array = OsLib_Geometry.getSurfaceZValues([surface])
         next if z_value_array.max == z_value_array.min # shouldn't see this unless wall is horizontal
+
         perimeter += area / (z_value_array.max - z_value_array.min)
       end
     end
@@ -1044,6 +1047,7 @@ module OsLib_Geometry
       edge_hash.each do |k1, v1|
         # apply to any floor boundary condition. This supports used in floors above basements
         next if v1[4] != 'Floor'
+
         edge_hash.each do |k2, v2|
           test_boundary_cond = false
           next if !tested_wall_boundary_condition.include?(v2[3]) # method arg takes multiple conditions
@@ -1161,6 +1165,7 @@ module OsLib_Geometry
       edge_hash.each do |k1, v1|
         next if v1[3] != 'Ground' # skip if not ground exposed floor
         next if v1[4] != 'Floor'
+
         edge_hash.each do |k2, v2|
           next if v2[3] != 'Outdoors' # skip if not exterior exposed wall (todo - update to handle basement)
           next if v2[4] != 'Wall'

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

@@ -353,10 +353,8 @@ module OsLib_HelperMethods
     objectArray.each do |object|
       object_LCCs = object.lifeCycleCosts
       object_LCCs.each do |object_LCC|
-        if object_LCC.category == category
-          if onlyYearFromStartZero == false || object_LCC.yearsFromStart == 0
-            counter += object_LCC.totalCost
-          end
+        if object_LCC.category == category && (onlyYearFromStartZero == false || object_LCC.yearsFromStart == 0)
+          counter += object_LCC.totalCost
         end
       end
     end

data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb

@@ -49,7 +49,7 @@ class SpaceTypeAndConstructionSetWizard < OpenStudio::Measure::ModelMeasure
   # 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.rb'
+  require 'openstudio/extension/core/os_lib_model_generation'
 
   # resource files used by measure
   include OsLib_HelperMethods

data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>space_type_and_construction_set_wizard</name>
   <uid>7c65af63-4316-47c9-b7a5-68d7a019e533</uid>
-  <version_id>a0577cf6-a844-4d90-a7c6-2a3f54e65bfd</version_id>
-  <version_modified>20210423T142525Z</version_modified>
+  <version_id>c10f0999-8ad9-46fa-8caa-953db92a07e6</version_id>
+  <version_modified>20220505T182932Z</version_modified>
   <xml_checksum>057E8D9D</xml_checksum>
   <class_name>SpaceTypeAndConstructionSetWizard</class_name>
   <display_name>Space Type and Construction Set Wizard</display_name>
@@ -372,7 +372,7 @@
       <filename>SpaceTypeAndConstructionSetWizard_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>A33BC44E</checksum>
+      <checksum>6904B5F3</checksum>
     </file>
     <file>
       <version>
@@ -383,7 +383,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>ECB1C32A</checksum>
+      <checksum>729BA750</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/SurfaceMatching/measure.rb

@@ -81,6 +81,7 @@ class SurfaceMatching < OpenStudio::Measure::ModelMeasure
     surfaces.each do |surface|
       if surface.outsideBoundaryCondition == 'Surface'
         next if !surface.adjacentSurface.is_initialized # don't count as matched if boundary condition is right but no matched object
+
         initialMatchedSurfaceCounter += 1
       end
     end

data/lib/measures/SurfaceMatching/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>surface_matching</name>
   <uid>e9c69c36-bf33-4ac4-b695-41dee26ee880</uid>
-  <version_id>1b01d623-5de5-4dbf-a775-82119cbc16f4</version_id>
-  <version_modified>20210423T142525Z</version_modified>
+  <version_id>35935b9b-4dc3-4f1b-a680-050c6b356365</version_id>
+  <version_modified>20220505T182930Z</version_modified>
   <xml_checksum>45097B60</xml_checksum>
   <class_name>SurfaceMatching</class_name>
   <display_name>SurfaceMatching</display_name>
@@ -66,6 +66,12 @@
       <usage_type>readme</usage_type>
       <checksum>FBF56DB2</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>A21A3ED2</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -75,19 +81,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>2C1EB547</checksum>
+      <checksum>BE5B9A0D</checksum>
     </file>
     <file>
       <filename>SurfaceMatching_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>C729BC9F</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>A21A3ED2</checksum>
+      <checksum>726F8146</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_empd_material_properties/LICENSE.md

@@ -0,0 +1,27 @@
+OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted 
+provided that the following conditions are met:
+
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions 
+and the following disclaimer.
+
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse 
+or promote products derived from this software without specific prior written permission from the 
+respective party.
+
+(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
+derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
+designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, 
+OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.