openstudio-common-measures 0.3.2 → 0.6.0

data/lib/measures/generic_qaqc/resources/os_lib_reporting_qaqc.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:
@@ -126,7 +126,7 @@ module OsLib_Reporting
     # gather data for section
     qaqc_check_summary = {}
     qaqc_check_summary[:title] = 'List of Checks in Measure'
-    qaqc_check_summary[:header] = ['Name', 'Category', 'Flags', 'Description']
+    qaqc_check_summary[:header] = ['Name', 'Category', 'Flags', 'Tolerance','Description']
     qaqc_check_summary[:data] = []
     qaqc_check_summary[:data_color] = []
     @qaqc_check_section = {}
@@ -152,28 +152,62 @@ module OsLib_Reporting
       check_name = nil
       check_cat = nil
       check_desc = nil
+      check_min_pass = nil
+      check_max_pass = nil
       flags = []
-      # loop through attributes (name,category,description,then optionally one or more flag attributes)
-      check.valueAsAttributeVector.each_with_index do |value, index|
-        if index == 0
-          check_name = value.valueAsString
-        elsif index == 1
-          check_cat = value.valueAsString
-        elsif index == 2
-          check_desc = value.valueAsString
+
+
+      # loop through attributes (name,category,description, min tol, max tol ,then optionally one or more flag attributes)
+      check.valueAsAttributeVector.each do |attribute|
+        if attribute.name == "name"
+          check_name = attribute.valueAsString
+        elsif attribute.name == 'category'
+          check_cat = attribute.valueAsString
+        elsif attribute.name == 'description'
+          check_desc = attribute.valueAsString
+        elsif attribute.name == 'min_pass'
+          if ['Double','Integer'].include? (attribute.valueType.valueDescription)
+            check_min_pass = attribute.valueAsDouble
+          else
+            check_min_pass = attribute.valueAsString
+          end
+        elsif attribute.name == 'max_pass'
+          if ['Double','Integer'].include? (attribute.valueType.valueDescription)
+            check_max_pass = attribute.valueAsDouble
+          else
+            check_max_pass = attribute.valueAsString
+          end
         else # should be flag
-          flags << value.valueAsString
-          qaqc_flag_details[:data] << [value.valueAsString]
-          runner.registerWarning("#{check_name} - #{value.valueAsString}")
+          flags << attribute.valueAsString
+          qaqc_flag_details[:data] << [attribute.valueAsString]
+          runner.registerWarning("#{check_name} - #{attribute.valueAsString}")
           num_flags += 1
-        end
+        end          
       end
 
       # add row to table for this check
-      qaqc_check_summary[:data] << [check_name, check_cat, flags.size, check_desc]
+      # check_supply_air_and_thermostat_temp_difference should have unit for F instead of default %, can add that here or do I need to pass in from that method
+      if !check_min_pass.nil? && !check_min_pass.instance_of?(String) && check_min_pass.abs > 0
+        tol_val = check_min_pass
+      elsif !check_max_pass.nil? && !check_min_pass.instance_of?(String) && check_max_pass.abs > 0
+        tol_val = check_max_pass
+      elsif
+        tol_val = check_min_pass # should empty string or Var
+      end
+
+      # change units for some checks #todo - this can be changed later to use "unit" attribute
+      if check_name == 'Supply and Zone Air Temperature'
+        tol_val = "#{tol_val} F"        
+      elsif check_name == 'Baseline Mechanical System Type'
+        tol_val = "#{tol_val}"        
+      else
+        tol_val = "#{tol_val}%"
+      end
+
+      qaqc_check_summary[:data] << [check_name, check_cat, flags.size, tol_val ,check_desc]
 
       # add info message for check if no flags found (this way user still knows what ran)
-      if check.valueAsAttributeVector.size < 4
+      if num_flags == 0
         runner.registerInfo("#{check_name} - no flags.")
       end
 

data/lib/measures/generic_qaqc/resources/report.html.erb

@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2022, 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:
@@ -39,6 +39,13 @@
 
 
 
+
+
+
+
+
+
+
 <!DOCTYPE html>
 <html lang="en">
 <head>

data/lib/measures/get_site_from_building_component_library/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/get_site_from_building_component_library/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/get_site_from_building_component_library/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>get_site_from_building_component_library</name>
   <uid>a6dff045-6f62-4288-a3f0-a5549f4c292a</uid>
-  <version_id>2a807499-50fc-4472-b873-928056eeabea</version_id>
-  <version_modified>20200509T041913Z</version_modified>
+  <version_id>df86d4f6-1e3c-4724-8215-807aa1f4e991</version_id>
+  <version_modified>20210406T220305Z</version_modified>
   <xml_checksum>99E7000D</xml_checksum>
   <class_name>GetSiteFromBuildingComponentLibrary</class_name>
   <display_name>Get Site from Building Component Library</display_name>
@@ -115,19 +115,19 @@
       <filename>bcl_api_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>2B96ED07</checksum>
+      <checksum>9C9180AD</checksum>
     </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <filename>get_site_from_building_component_library_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>D2DF7036</checksum>
+      <checksum>C16D4B39</checksum>
     </file>
     <file>
       <version>
@@ -138,7 +138,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>A0260DC0</checksum>
+      <checksum>02536E57</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/hvac_psychrometric_chart/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/hvac_psychrometric_chart/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/hvac_psychrometric_chart/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>hvac_psychrometric_chart</name>
   <uid>97213780-0727-4462-8ec0-9a6c3e475cd6</uid>
-  <version_id>15fef178-c6a4-4c51-a011-61785817b924</version_id>
-  <version_modified>20200623T195835Z</version_modified>
+  <version_id>65abd215-893b-472a-9876-175f63f27728</version_id>
+  <version_modified>20220506T153446Z</version_modified>
   <xml_checksum>F657B621</xml_checksum>
   <class_name>HVACPsychrometricChart</class_name>
   <display_name>HVAC Psychrometric Chart</display_name>
@@ -61,11 +61,17 @@
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>3DE900D7</checksum>
+    </file>
     <file>
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
+      <checksum>A21A3ED2</checksum>
     </file>
     <file>
       <version>
@@ -76,25 +82,19 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>3E6E7724</checksum>
+      <checksum>1F7F5021</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>3DE900D7</checksum>
+      <filename>hvac_psychrometric_chart_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>63508164</checksum>
     </file>
     <file>
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>FC1A190D</checksum>
-    </file>
-    <file>
-      <filename>hvac_psychrometric_chart_test.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>07B326D0</checksum>
+      <checksum>0006E928</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/hvac_psychrometric_chart/resources/report.html.erb

@@ -1,6 +1,6 @@
 <%
   # *******************************************************************************
-  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+  # OpenStudio(R), Copyright (c) 2008-2022, 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:
@@ -39,6 +39,13 @@
 
 
 
+
+
+
+
+
+
+
 <!DOCTYPE html>
 <html>
 <head>

data/lib/measures/inject_idf_objects/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/inject_idf_objects/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/inject_idf_objects/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>inject_idf_objects</name>
   <uid>f567dfbc-d280-4d68-b061-019ab2630cd0</uid>
-  <version_id>50ae3f92-5650-4971-a14e-370c542eb6bf</version_id>
-  <version_modified>20200623T195835Z</version_modified>
+  <version_id>27bc8e62-185b-4670-b5ce-548ee42ec4e7</version_id>
+  <version_modified>20210406T220305Z</version_modified>
   <xml_checksum>A8BAB05F</xml_checksum>
   <class_name>InjectIDFObjects</class_name>
   <display_name> Inject IDF Objects</display_name>
@@ -78,12 +78,6 @@ This measure works for when you just need to add new IDF objects. If you need to
       <usage_type>test</usage_type>
       <checksum>F5FABCCF</checksum>
     </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>E0468DD6</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -96,6 +90,12 @@ This measure works for when you just need to add new IDF objects. If you need to
       <usage_type>readme</usage_type>
       <checksum>3D0882F2</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>
@@ -105,13 +105,13 @@ This measure works for when you just need to add new IDF objects. If you need to
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>83CDE9EB</checksum>
+      <checksum>FFC40353</checksum>
     </file>
     <file>
       <filename>measure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>B8EDD274</checksum>
+      <checksum>BCA08D25</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/openstudio_results/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/openstudio_results/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:
@@ -36,11 +36,13 @@
 require 'erb'
 require 'json'
 
+# load OpenStudio measure libraries from openstudio-extension gem
+require 'openstudio-extension'
+require 'openstudio/extension/core/os_lib_schedules'
+require 'openstudio/extension/core/os_lib_helper_methods'
+
 # load local resources
 require "#{File.dirname(__FILE__)}/resources/os_lib_reporting"
-require "#{File.dirname(__FILE__)}/resources/os_lib_schedules"
-require "#{File.dirname(__FILE__)}/resources/os_lib_helper_methods"
-
 require_relative 'resources/Siz.Model'
 
 # start the measure