openstudio-model-articulation 0.3.1 → 0.6.0

data/lib/measures/radiance_measure/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -50,6 +50,7 @@ require 'open3'
 class Array
   def average
     raise 'Cannot average 0 items' if empty?
+
     sum = inject(:+)
 
     (sum / size).to_f
@@ -126,6 +127,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
     print_statement("Reading '#{filename}'", runner)
     raise "Could not find illuminance file #{filename}" unless File.exist?(filename)
+
     File.read(filename).each_line do |line|
       data_section = true if line =~ /^\s?\d/
       if data_section
@@ -360,9 +362,10 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
     coreCount = OpenStudio::System.numberOfProcessors
     sim_cores = '1'
 
-    if use_cores == 'Max'
+    case use_cores
+    when 'Max'
       sim_cores = coreCount
-    elsif use_cores == 'Min'
+    when 'Min'
       sim_cores = 1
     else
       sim_cores = coreCount - 1
@@ -422,12 +425,12 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
           perlpath = OpenStudio.getApplicationRunDirectory.parent_path /
                      OpenStudio::Path.new('strawberry-perl-5.16.2.1-32bit-portable-reduced/perl/bin')
         end
-        print_statement('Adding path for local perl: ' + perlpath.to_s, runner)
-        ENV['PATH'] = path + ';' + ENV['PATH'] + ';' + perlpath.to_s
-        ENV['RAYPATH'] = path + ';' + raypath + ';.'
+        print_statement("Adding path for local perl: #{perlpath}", runner)
+        ENV['PATH'] = "#{path};#{ENV['PATH']};#{perlpath}"
+        ENV['RAYPATH'] = "#{path};#{raypath};."
       else
-        ENV['PATH'] = path + ':' + ENV['PATH']
-        ENV['RAYPATH'] = path + ':' + raypath + ':.'
+        ENV['PATH'] = "#{path}:#{ENV['PATH']}"
+        ENV['RAYPATH'] = "#{path}:#{raypath}:."
       end
 
     end
@@ -512,14 +515,10 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
     print_statement('Running on Windows (sorry)', runner) if OS.windows && debug_mode
     print_statement('Running on unix', runner) if OS.unix && debug_mode
 
-    if !got_2x
-
-      if Dir.glob(epw2weapath + programExtension).empty?
-
-        runner.registerError("Cannot find epw2wea tool in radiance installation at '#{radiancePath}'. You may need to install a newer version of Radiance.")
-        exit false
+    if !got_2x && Dir.glob(epw2weapath + programExtension).empty?
 
-      end
+      runner.registerError("Cannot find epw2wea tool in radiance installation at '#{radiancePath}'. You may need to install a newer version of Radiance.")
+      exit false
 
     end
 
@@ -738,7 +737,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
         tempSettings = tempIO.split(' ')
         options_klemsDensity = "#{tempSettings[0]} #{tempSettings[1]}"
         options_skyvecDensity = tempSettings[3].split(':')[1]
-        options_tregVars = tempSettings[2..-1].join(' ')
+        options_tregVars = tempSettings[2..].join(' ')
       end
 
       File.open("#{radPath}/options/dmx.opt", 'r') do |file|
@@ -777,11 +776,13 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
       windowGroupCheck = File.open('bsdf/mapping.rad')
       windowGroupCheck.each do |row|
         next if row[0] == '#'
+
         wg = row.split(',')[0]
 
-        if wg == 'WG0'
+        case wg
+        when 'WG0'
           haveWG0 = 'True'
-        elsif wg == 'WG1'
+        when 'WG1'
           haveWG1 = 'True'
         end
       end
@@ -804,6 +805,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
       windowMaps.each do |row|
         next if row[0] == '#'
+
         wg = row.split(',')[0]
 
         rad_command = ''
@@ -968,11 +970,13 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
       windowGroupCheck = File.open('bsdf/mapping.rad')
       windowGroupCheck.each do |row|
         next if row[0] == '#'
+
         wg = row.split(',')[0]
 
-        if wg == 'WG0'
+        case wg
+        when 'WG0'
           haveWG0 = 'True'
-        elsif wg == 'WG1'
+        when 'WG1'
           haveWG1 = 'True'
         end
       end
@@ -992,6 +996,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
       windowMaps.each do |row|
         # skip header
         next if row[0] == '#'
+
         wg = row.split(',')[0]
 
         # do uncontrolled windows (WG0)
@@ -1027,7 +1032,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
           else
 
-            wgXMLs = row.split(',')[4..-1]
+            wgXMLs = row.split(',')[4..]
             if wgXMLs.size > 2
               print_statement("WARN: Window Group #{wg} has #{wgXMLs.size} BSDFs (2 max supported by OpenStudio application).", runner)
             end
@@ -1071,6 +1076,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
         windowGroups = File.open('bsdf/mapping.rad')
         windowGroups.each do |wg|
           next if wg[0] == '#'              # skip header
+
           windowGroup = wg.split(',')[0]
           next if windowGroup == 'WG0'      # skip unshaded windows
 
@@ -1087,10 +1093,10 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
           wg_normal_z = wg_normal.split(' ')[2].to_f
 
           # DLM: hacktastic way to implement these options for now
-          if shadeControlType == 'AlwaysOn'
+          case shadeControlType
+          when 'AlwaysOn'
             shadeControlSetpoint = -1000
-          elsif
-            shadeControlType == 'AlwaysOff'
+          when 'AlwaysOff'
             shadeControlSetpoint = 10000000000
           end
 
@@ -1129,7 +1135,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
           wgIllum = File.open("output/ts/m_#{windowGroup}.ill", 'w')
           wgShade = File.open("output/ts/#{windowGroup}.shd", 'w')
           header.each { |head| wgIllum.print head.to_s }
-          wgMerge.to_a.each { |array_ts| wgIllum.print " #{array_ts.join(' ')}\n" } # note leading space, for compatibility with default rfluxmtx output
+          wgMerge.to_a.each { |array_ts| wgIllum.print " #{array_ts.join(' ')}\n" } # NOTE: leading space, for compatibility with default rfluxmtx output
           wgShadeSchedule.each { |sh| wgShade.print sh.to_s }
           wgIllum.close
           wgShade.close
@@ -1177,7 +1183,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
         print_statement("Starting final building illumimance file with #{mergeWindows[0]}...", runner)
         exec_statement("rmtxop -fa #{mergeWindows[0]} -t > output/final_merge.tmp", runner)
         # add remaining groups, one at a time
-        mergeWindows[1..-1].each do |merge|
+        mergeWindows[1..].each do |merge|
           print_statement("adding #{merge}...", runner)
           temp_fname = rand(36**15).to_s(36)
           while merge_count > 1
@@ -1317,7 +1323,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
           # iterate over each sensor and combine the views together
           new_hash = {}
 
-          t_radGlareSensorViews[space_name].each do |sensor, v|
+          t_radGlareSensorViews[space_name]&.each do |sensor, v|
             new_hash[sensor] = v[hour]
           end
           splitvalues[space_name] += [new_hash]
@@ -1416,7 +1422,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
       illum.length.times do |n|
         data[n] = illum[n].to_f
       rescue Exception => e
-        print_statement('Error inserting data: ' + illum[n] + ' inserting 0 instead', runner)
+        print_statement("Error inserting data: #{illum[n]} inserting 0 instead", runner)
         data[n] = 0
       end
 
@@ -1438,7 +1444,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
       # for each environment period (design days, annual, or arbitrary) you will create a directory for results
       t_sqlFile.availableEnvPeriods.each do |envPeriod|
-        print_statement("envPeriod = '" + envPeriod.to_s + "'", runner)
+        print_statement("envPeriod = '#{envPeriod}'", runner)
 
         diffHorizIllumAll, dirNormIllumAll, diffEfficacyAll, dirNormEfficacyAll, solarAltitudeAll, solarAzimuthAll, diffHorizUnits, dirNormUnits = getTimeSeries(t_sqlFile, envPeriod)
 
@@ -1493,16 +1499,14 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             # Debug
             # File.open('glareSensorValues.out', 'w') { |f| f.write(glareSensorValues.to_s) }
 
-            timeSeriesIllum[i] = tsDateTime.to_s.tr(' ', ',') + ',' + "#{dirNormIllum[i]},#{diffHorizIllum[i]}," + illumSensorValues.join(',') + ',' + illumValues.join(',')
+            timeSeriesIllum[i] = "#{tsDateTime.to_s.tr(' ', ',')},#{dirNormIllum[i]},#{diffHorizIllum[i]},#{illumSensorValues.join(',')},#{illumValues.join(',')}"
 
             # add glare sensor values
-            if t_radGlareSensorViews[space_name]
-              if !glareSensorValues.nil?
-                timeSeriesGlare[i] = tsDateTime.to_s.tr(' ', ',')
-                glareSensorValues.each_key do |key|
-                  glare_values = glareSensorValues[key].map { |_, v| v['dgp'] }
-                  timeSeriesGlare[i] += ",#{key},#{glare_values.average.round(2)},#{glare_values.min.round(2)},#{glare_values.max.round(2)},raw,#{glare_values.join(',')}"
-                end
+            if t_radGlareSensorViews[space_name] && !glareSensorValues.nil?
+              timeSeriesGlare[i] = tsDateTime.to_s.tr(' ', ',')
+              glareSensorValues.each_key do |key|
+                glare_values = glareSensorValues[key].map { |_, v| v['dgp'] }
+                timeSeriesGlare[i] += ",#{key},#{glare_values.average.round(2)},#{glare_values.min.round(2)},#{glare_values.max.round(2)},raw,#{glare_values.join(',')}"
               end
             end
 
@@ -1634,7 +1638,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               ys << ymin + (n * ySpacing)
             end
 
-            sqlOutFile.insertIlluminanceMap(space_name, space_name + ' DAYLIGHT MAP', t_epwFile.wmoNumber,
+            sqlOutFile.insertIlluminanceMap(space_name, "#{space_name} DAYLIGHT MAP", t_epwFile.wmoNumber,
                                             simDateTimes, xs, ys, map.originZCoordinate,
                                             illuminanceMatrixMaps)
 
@@ -1755,8 +1759,8 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             daylightSetpoint = secondaryDaylightingControl.get.illuminanceSetpoint
           else
             print_statement("Ignoring secondary daylighting control in ThermalZone '#{thermalZone.name}'", runner)
+          end
         end
-      end
 
         if daylightSetpoint == 0.0
           space.daylightingControls.each do |i|
@@ -1809,7 +1813,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
         schedule = schedule.get
 
-        schedule.setName(thermalZone.name.get + ' Lights Schedule')
+        schedule.setName("#{thermalZone.name.get} Lights Schedule")
 
         # remove all lights in this zone
         spaces.each do |space|
@@ -1872,6 +1876,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
         thermalZone = space.thermalZone
         next if thermalZone.empty?
+
         thermalZone = thermalZone.get
 
         map_name = "#{space_name} DAYLIGHT MAP"
@@ -1949,7 +1954,8 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
 
           da = 0
 
-          if $METHOD == 0
+          case $METHOD
+          when 0
 
             # get map values
             map_values = radoutFile.illuminanceMap(hourly_report_index)
@@ -1968,9 +1974,9 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               end
             end
 
-            da = num_da.to_f / num.to_f
+            da = num_da.to_f / num
 
-          elsif $METHOD == 1
+          when 1
 
             x = OpenStudio::DoubleVector.new
             y = OpenStudio::DoubleVector.new
@@ -2000,10 +2006,10 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               end
             end
 
-            da = num_da.to_f / num.to_f
-            cda = num_cda.to_f / num.to_f
-            udi = num_udi.to_f / num.to_f
-            sda = num_sda.to_f / num.to_f
+            da = num_da.to_f / num
+            cda = num_cda.to_f / num
+            udi = num_udi.to_f / num
+            sda = num_sda.to_f / num
 
           end
 
@@ -2042,7 +2048,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             da_daylit_num += 1
           end
         end
-        annual_da_daylit = da_daylit_sum.to_f / da_daylit_num.to_f
+        annual_da_daylit = da_daylit_sum.to_f / da_daylit_num
         summary_report += "#{space_name},DA(#{daylightSetpoint.round(0)}),Daylit Hours,#{annual_da_daylit.round(2)},#{da_daylit_sum.round(0)},#{da_daylit_num}\n"
         if !peopleTimeseries.empty?
           da_occupied_sum = 0
@@ -2054,7 +2060,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             end
           end
           # annual_da_occupied = (da_occupied_num == 0.0 || da_occupied_sum == 0.0) ? 0.0 : da_occupied_sum.to_f / da_occupied_num.to_f
-          annual_da_occupied = da_occupied_sum.to_f / da_occupied_num.to_f
+          annual_da_occupied = da_occupied_sum.to_f / da_occupied_num
           summary_report += "#{space_name},DA(#{daylightSetpoint.round(0)}),Occupied Hours,#{annual_da_occupied.round(2)},#{da_occupied_sum.round(0)},#{da_occupied_num}\n"
 
           da_daylit_occupied_sum = 0
@@ -2066,7 +2072,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             end
           end
           # annual_da_daylit_occupied = (da_daylit_occupied_num == 0.0 || da_daylit_occupied_sum == 0.0) ? 0.0 : da_daylit_occupied_sum.to_f / da_daylit_occupied_num.to_f
-          annual_da_daylit_occupied = da_daylit_occupied_sum.to_f / da_daylit_occupied_num.to_f
+          annual_da_daylit_occupied = da_daylit_occupied_sum.to_f / da_daylit_occupied_num
           summary_report += "#{space_name},DA(#{daylightSetpoint.round(0)}),Daylit and Occupied Hours,#{annual_da_daylit_occupied.round(2)},#{da_daylit_occupied_sum.round(0)},#{da_daylit_occupied_num}\n"
         end
 
@@ -2079,7 +2085,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             cda_daylit_num += 1
           end
         end
-        annual_cda_daylit = cda_daylit_sum.to_f / cda_daylit_num.to_f
+        annual_cda_daylit = cda_daylit_sum.to_f / cda_daylit_num
         summary_report += "#{space_name},conDA(#{daylightSetpoint.round(0)}),Daylit Hours,#{annual_cda_daylit.round(2)},#{cda_daylit_sum.round(0)},#{cda_daylit_num}\n"
 
         if !peopleTimeseries.empty?
@@ -2091,7 +2097,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               cda_occupied_num += 1
             end
           end
-          annual_cda_occupied = cda_occupied_sum.to_f / cda_occupied_num.to_f
+          annual_cda_occupied = cda_occupied_sum.to_f / cda_occupied_num
           summary_report += "#{space_name},conDA(#{daylightSetpoint.round(0)}),Occupied Hours,#{annual_cda_occupied.round(2)},#{cda_occupied_sum.round(0)},#{cda_occupied_num}\n"
 
           cda_daylit_occupied_sum = 0
@@ -2102,7 +2108,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               cda_daylit_occupied_num += 1
             end
           end
-          annual_cda_daylit_occupied = cda_daylit_occupied_sum.to_f / cda_daylit_occupied_num.to_f
+          annual_cda_daylit_occupied = cda_daylit_occupied_sum.to_f / cda_daylit_occupied_num
           summary_report += "#{space_name},conDA(#{daylightSetpoint.round(0)}),Daylit and Occupied Hours,#{annual_cda_daylit_occupied.round(2)},#{cda_daylit_occupied_sum.round(0)},#{cda_daylit_occupied_num}\n"
         end
 
@@ -2115,7 +2121,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             udi_daylit_num += 1
           end
         end
-        annual_udi_daylit = udi_daylit_sum.to_f / udi_daylit_num.to_f
+        annual_udi_daylit = udi_daylit_sum.to_f / udi_daylit_num
         summary_report += "#{space_name},UDI(100-3000),Daylit Hours,#{annual_udi_daylit.round(2)},#{udi_daylit_sum.round(0)},#{udi_daylit_num}\n"
         if !peopleTimeseries.empty?
           udi_occupied_sum = 0
@@ -2126,7 +2132,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               udi_occupied_num += 1
             end
           end
-          annual_udi_occupied = udi_occupied_sum.to_f / udi_occupied_num.to_f
+          annual_udi_occupied = udi_occupied_sum.to_f / udi_occupied_num
           summary_report += "#{space_name},UDI(100-3000),Occupied Hours,#{annual_udi_occupied.round(2)},#{udi_occupied_sum.round(0)},#{udi_occupied_num}\n"
 
           udi_daylit_occupied_sum = 0
@@ -2137,7 +2143,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
               udi_daylit_occupied_num += 1
             end
           end
-          annual_udi_daylit_occupied = udi_daylit_occupied_sum.to_f / udi_daylit_occupied_num.to_f
+          annual_udi_daylit_occupied = udi_daylit_occupied_sum.to_f / udi_daylit_occupied_num
           summary_report += "#{space_name},UDI(100-3000),Daylit and Occupied Hours,#{annual_udi_daylit_occupied.round(2)},#{cda_daylit_occupied_sum.round(0)},#{cda_daylit_occupied_num}\n"
         end
 
@@ -2150,7 +2156,7 @@ class RadianceMeasure < OpenStudio::Measure::ModelMeasure
             sda_num += 1
           end
         end
-        annual_sda = sda_sum.to_f / sda_num.to_f
+        annual_sda = sda_sum.to_f / sda_num
         summary_report += "#{space_name},sDA(300),8AM-5PM (10 hours/day per IESNA LM-83-12),#{annual_sda.round(2)},#{sda_sum.round(0)},#{sda_num}\n"
 
         # Make building average metrics

data/lib/measures/radiance_measure/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>radiance_measure</name>
   <uid>1e3cfef8-b051-4e60-8bb0-ed2d29d4f45f</uid>
-  <version_id>77b56312-1bff-49a4-91e8-64db8264357c</version_id>
-  <version_modified>20200624T011257Z</version_modified>
+  <version_id>9b2fd6b5-9767-4a55-9b61-eb663567509b</version_id>
+  <version_modified>20220505T182929Z</version_modified>
   <xml_checksum>381B7733</xml_checksum>
   <class_name>RadianceMeasure</class_name>
   <display_name>Radiance Daylighting Measure</display_name>
@@ -172,11 +172,17 @@
       <usage_type>test</usage_type>
       <checksum>4255EB94</checksum>
     </file>
+    <file>
+      <filename>measure_test_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>909929E9</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -187,19 +193,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>609FCC24</checksum>
+      <checksum>FD74EFB9</checksum>
     </file>
     <file>
       <filename>radiance_measure_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>DD169097</checksum>
-    </file>
-    <file>
-      <filename>measure_test_model.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>909929E9</checksum>
+      <checksum>AAD3F5F1</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/radiant_slab_with_doas/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+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:

data/lib/measures/radiant_slab_with_doas/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -220,7 +220,11 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
     # remove existing hvac systems
     if remove_existing_hvac
       runner.registerInfo('Removing existing HVAC systems from the model')
-      std.remove_HVAC(model)
+      if std.respond_to?('remove_HVAC')
+        std.remove_HVAC(model) # OpenStuido 3.2.1 and earlierop use this, future versions will use snake_case method
+      else
+        std.remove_hvac(model)
+      end
     end
 
     # exclude plenum zones, zones without thermostats, and zones with no floor area
@@ -228,6 +232,7 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
     model.getThermalZones.each do |zone|
       next if std.thermal_zone_plenum?(zone)
       next if !std.thermal_zone_heated?(zone) && !std.thermal_zone_cooled?(zone)
+
       conditioned_zones << zone
     end
 
@@ -382,8 +387,10 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
         next if radiant_type == 'floor' && surface.surfaceType != 'Floor'
         next if radiant_type == 'ceiling' && surface.surfaceType != 'RoofCeiling'
         next unless surface.space.is_initialized
+
         surface_space_name = surface.space.get.name.to_s
         next unless conditioned_space_names.include? surface_space_name
+
         var = OpenStudio::Model::OutputVariable.new('Surface Inside Face Temperature', model)
         var.setKeyValue(surface.name.to_s)
         vars << var

data/lib/measures/radiant_slab_with_doas/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>radiant_slab_with_doas</name>
   <uid>8091a0c3-7760-4da6-adf4-133d55872816</uid>
-  <version_id>6a2e572a-a2c1-483b-8263-0c81dfcd5f49</version_id>
-  <version_modified>20201026T190725Z</version_modified>
+  <version_id>764afd7f-f6e7-4e73-bc92-1230e49b2145</version_id>
+  <version_modified>20220505T182927Z</version_modified>
   <xml_checksum>C49A7DAB</xml_checksum>
   <class_name>RadiantSlabWithDoas</class_name>
   <display_name>Radiant Slab with DOAS</display_name>
@@ -323,7 +323,13 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
+    </file>
+    <file>
+      <filename>radiant_slab_with_doas_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>2317B466</checksum>
     </file>
     <file>
       <version>
@@ -334,13 +340,7 @@ To reduce unmet hours, use an expanded comfort range as mentioned above, remove
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>466F7B10</checksum>
-    </file>
-    <file>
-      <filename>radiant_slab_with_doas_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>34F1B714</checksum>
+      <checksum>12177EE8</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/replace_geometry_by_story/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+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:

data/lib/measures/replace_geometry_by_story/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# 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:
@@ -83,6 +83,7 @@ class ReplaceGeometryByStory < OpenStudio::Measure::ModelMeasure
     story_hash = {}
     model.getBuildingStorys.each do |story|
       next if !story.spaces.first.spaceType.is_initialized
+
       story_hash[story] = {}
       story_hash[story][:space_type] = story.spaces.first.spaceType.get
 
@@ -198,6 +199,7 @@ class ReplaceGeometryByStory < OpenStudio::Measure::ModelMeasure
       if hash[:basement]
         space.surfaces.each do |surface|
           next if surface.surfaceType != 'Wall'
+
           surface.setOutsideBoundaryCondition('Ground')
         end
       end
@@ -214,6 +216,7 @@ class ReplaceGeometryByStory < OpenStudio::Measure::ModelMeasure
       space.surfaces.each do |surface|
         next if surface.outsideBoundaryCondition != 'Outdoors'
         next if surface.surfaceType != 'Wall'
+
         surface.setWindowToWallRatio(target_wwr)
       end
     end
@@ -222,6 +225,7 @@ class ReplaceGeometryByStory < OpenStudio::Measure::ModelMeasure
     zone_hash = {} # key is zone value is floor area. It excludes zones with non 1 multiplier
     model.getThermalZones.each do |thermal_zone|
       next if thermal_zone.multiplier > 1
+
       zone_hash[thermal_zone] = thermal_zone.floorArea
     end
     target_zone = zone_hash.key(zone_hash.values.max)

data/lib/measures/replace_geometry_by_story/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>replace_geometry_by_story</name>
   <uid>03b18912-0ceb-47e9-8f8b-417a3008e189</uid>
-  <version_id>6fc4d9fe-9b38-4ce3-ba03-a2b462e4dd8e</version_id>
-  <version_modified>20200509T155937Z</version_modified>
+  <version_id>0c043052-fbe4-4cb6-809b-4659f265a0dd</version_id>
+  <version_modified>20220505T182928Z</version_modified>
   <xml_checksum>2AF3A68E</xml_checksum>
   <class_name>ReplaceGeometryByStory</class_name>
   <display_name>Replace Geometry By Story</display_name>
@@ -61,7 +61,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -72,13 +72,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>96B62A79</checksum>
+      <checksum>7478785A</checksum>
     </file>
     <file>
       <filename>replace_geometry_by_story_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>73A79D27</checksum>
+      <checksum>DC2F0000</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/scale_geometry/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
+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:

data/lib/measures/scale_geometry/measure.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# 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:

data/lib/measures/scale_geometry/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>scale_geometry</name>
   <uid>f9cc2ffc-2838-4a18-8330-97e7cc94cdf8</uid>
-  <version_id>b075de7b-1223-4ce5-993b-a4010abfbded</version_id>
-  <version_modified>20200509T155938Z</version_modified>
+  <version_id>ea83673c-44b7-4fa4-90f4-f26a9ebf52bb</version_id>
+  <version_modified>20220505T182930Z</version_modified>
   <xml_checksum>7AD75066</xml_checksum>
   <class_name>ScaleGeometry</class_name>
   <display_name>scale_geometry</display_name>
@@ -104,19 +104,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>57103EB1</checksum>
+      <checksum>A36635B3</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <filename>scale_geometry_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>AEBD2413</checksum>
+      <checksum>5A612286</checksum>
     </file>
   </files>
 </measure>

data/lib/openstudio/model_articulation/extension.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# 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: