openstudio-common-measures 0.8.0 → 0.10.0

data/lib/measures/generic_qaqc/resources/check_schedules.rb

@@ -66,7 +66,7 @@ module OsLib_QAQC
           # skip if all spaces using this space type are plenums
           all_spaces_plenums = true
           space_type.spaces.each do |space|
-            if !std.space_plenum?(space)
+            if !OpenstudioStandards::Space.space_plenum?(space)
               all_spaces_plenums = false
               next
             end
@@ -90,7 +90,7 @@ module OsLib_QAQC
             check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['lighting_schedule']} in standards json.")
           else
             # loop through and test individual load instances
-            target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get)
+            target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get)
             space_type.lights.each do |load_inst|
               inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard)
               if inst_sch_check then check_elems << inst_sch_check end
@@ -107,7 +107,7 @@ module OsLib_QAQC
             check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['electric_equipment_schedule']} in standards json.")
           else
             # loop through and test individual load instances
-            target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get)
+            target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get)
 
             space_type.electricEquipment.each do |load_inst|
               inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard)
@@ -125,7 +125,7 @@ module OsLib_QAQC
             check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['gas_equipment_schedule']} in standards json.")
           else
             # loop through and test individual load instances
-            target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get)
+            target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get)
             space_type.gasEquipment.each do |load_inst|
               inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard)
               if inst_sch_check then check_elems << inst_sch_check end
@@ -141,7 +141,7 @@ module OsLib_QAQC
             check_elems << OpenStudio::Attribute.new('flag', "Didn't find schedule named #{data['occupancy_schedule']} in standards json.")
           else
             # loop through and test individual load instances
-            target_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_target.to_ScheduleRuleset.get)
+            target_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_target.to_ScheduleRuleset.get)
             space_type.people.each do |load_inst|
               inst_sch_check = generate_load_insc_sch_check_attribute(target_hrs, load_inst, space_type, check_elems, min_pass, max_pass, target_standard)
               if inst_sch_check then check_elems << inst_sch_check end
@@ -182,7 +182,7 @@ module OsLib_QAQC
 
       # warn if there are spaces in model that don't use space type unless they appear to be plenums
       @model.getSpaces.each do |space|
-        next if std.space_plenum?(space)
+        next if OpenstudioStandards::Space.space_plenum?(space)
         if !space.spaceType.is_initialized
           check_elems << OpenStudio::Attribute.new('flag', "#{space.name} doesn't have a space type assigned, can't validate schedules.")
         end
@@ -234,7 +234,7 @@ module OsLib_QAQC
 
     # get annual equiv for model schedule
     if schedule_inst.to_ScheduleRuleset.is_initialized
-      inst_hrs = std.schedule_ruleset_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleRuleset.get)
+      inst_hrs = OpenstudioStandards::Schedules.schedule_ruleset_get_equivalent_full_load_hours(schedule_inst.to_ScheduleRuleset.get)
     elsif schedule_inst.to_ScheduleConstant.is_initialized
       inst_hrs = std.schedule_constant_annual_equivalent_full_load_hrs(schedule_inst.to_ScheduleConstant.get)
     else

data/lib/measures/generic_qaqc/resources/check_supply_air_and_thermostat_temp_difference.rb

@@ -60,17 +60,20 @@ module OsLib_QAQC
               if use_old_gem_code
                 schedule_values = clg_sch.to_ScheduleRuleset.get.annual_min_max_value
               else
-                schedule_values = std.schedule_ruleset_annual_min_max_value(clg_sch.to_ScheduleRuleset.get)
+                schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(clg_sch)
               end
             elsif clg_sch.to_ScheduleConstant.is_initialized
               if use_old_gem_code
                 schedule_values = clg_sch.to_ScheduleConstant.get.annual_min_max_value
               else
-                schedule_values = std.schedule_constant_annual_min_max_value(clg_sch.to_ScheduleConstant.get)
+                schedule_values = OpenstudioStandards::Schedules.schedule_get_min_max(clg_sch)
               end
             end
 
             unless schedule_values.nil?
+              puts "hello1"
+              puts schedule_values
+              puts "hello2"
               model_clg_min = schedule_values['min']
             end
           end

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

@@ -23,6 +23,7 @@
 
 
 
+
 
 
 <!DOCTYPE html>

data/lib/measures/get_site_from_building_component_library/measure.rb

@@ -6,14 +6,8 @@
 # see the URL below for information on how to write OpenStudio measures
 # http://nrel.github.io/OpenStudio-user-documentation/measures/measure_writing_guide/
 
-# load OpenStudio measure libraries from openstudio-extension gem
-require 'openstudio-extension'
-require 'openstudio/extension/core/os_lib_helper_methods'
-
 # start the measure
 class GetSiteFromBuildingComponentLibrary < OpenStudio::Measure::ModelMeasure
-  # resource file modules
-  include OsLib_HelperMethods
 
   # human readable name
   def name
@@ -56,14 +50,16 @@ class GetSiteFromBuildingComponentLibrary < OpenStudio::Measure::ModelMeasure
     super(model, runner, user_arguments)
 
     # assign the user inputs to variables
-    args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model))
+    args = runner.getArgumentValues(arguments(model), user_arguments)
+    args = Hash[args.collect{ |k, v| [k.to_s, v] }]
     if !args then return false end
 
     # lookup and replace argument values from upstream measures
     if args['use_upstream_args'] == true
       args.each do |arg, value|
         next if arg == 'use_upstream_args' # this argument should not be changed
-        value_from_osw = OsLib_HelperMethods.check_upstream_measure_for_arg(runner, arg)
+        value_from_osw = runner.getPastStepValuesForName(arg)
+        value_from_osw = value_from_osw.collect{ |k, v| Hash[:measure_name => k, :value => v] }.first if !value_from_osw.empty?
         if !value_from_osw.empty?
           runner.registerInfo("Replacing argument named #{arg} from current measure with a value of #{value_from_osw[:value]} from #{value_from_osw[:measure_name]}.")
           new_val = value_from_osw[:value]

data/lib/measures/get_site_from_building_component_library/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>get_site_from_building_component_library</name>
   <uid>a6dff045-6f62-4288-a3f0-a5549f4c292a</uid>
-  <version_id>6cfdd1c0-eae5-4eba-b422-fde5d082ee4c</version_id>
-  <version_modified>20221115T223607Z</version_modified>
+  <version_id>aa3db6e6-f8bf-492f-9fcd-b2c8750c4352</version_id>
+  <version_modified>2024-07-11T14:32:10Z</version_modified>
   <xml_checksum>99E7000D</xml_checksum>
   <class_name>GetSiteFromBuildingComponentLibrary</class_name>
   <display_name>Get Site from Building Component Library</display_name>
@@ -94,10 +94,16 @@
   </attributes>
   <files>
     <file>
-      <filename>example_model.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>C4F35230</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>FAAFE9B7</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -106,39 +112,33 @@
       <checksum>703C9964</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>FAAFE9B7</checksum>
+      <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>4D81272B</checksum>
     </file>
     <file>
       <filename>bcl_api_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>9EE93012</checksum>
+      <checksum>1CD9B490</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>example_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>C4F35230</checksum>
     </file>
     <file>
       <filename>get_site_from_building_component_library_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>F5BB0628</checksum>
-    </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>2.0.0</identifier>
-        <min_compatible>2.8.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>3FBDCCAF</checksum>
+      <checksum>AE95604F</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/hvac_psychrometric_chart/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>hvac_psychrometric_chart</name>
   <uid>97213780-0727-4462-8ec0-9a6c3e475cd6</uid>
-  <version_id>dad1d895-c678-4bb4-879d-3eae5fded9d3</version_id>
-  <version_modified>20221115T224202Z</version_modified>
+  <version_id>b6eca7ed-6047-4a27-9190-773f8e670e5c</version_id>
+  <version_modified>2024-07-11T14:32:02Z</version_modified>
   <xml_checksum>F657B621</xml_checksum>
   <class_name>HVACPsychrometricChart</class_name>
   <display_name>HVAC Psychrometric Chart</display_name>
@@ -44,22 +44,10 @@
   </attributes>
   <files>
     <file>
-      <filename>model_test.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>34E3E58A</checksum>
-    </file>
-    <file>
-      <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
-      <filetype>epw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>BDF687C1</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>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -68,10 +56,10 @@
       <checksum>3DE900D7</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -82,19 +70,31 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>7C4C392E</checksum>
+      <checksum>E80959ED</checksum>
+    </file>
+    <file>
+      <filename>report.html.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FB03153C</checksum>
+    </file>
+    <file>
+      <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
+      <filetype>epw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>BDF687C1</checksum>
     </file>
     <file>
       <filename>hvac_psychrometric_chart_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CE7469B8</checksum>
+      <checksum>8046D052</checksum>
     </file>
     <file>
-      <filename>report.html.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>3DE4D1D8</checksum>
+      <filename>model_test.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>34E3E58A</checksum>
     </file>
   </files>
 </measure>

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

@@ -23,6 +23,7 @@
 
 
 
+
 
 
 <!DOCTYPE html>

data/lib/measures/inject_idf_objects/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>inject_idf_objects</name>
   <uid>f567dfbc-d280-4d68-b061-019ab2630cd0</uid>
-  <version_id>d5c3cd4a-e663-4bb7-bb6c-e0f0cddbead9</version_id>
-  <version_modified>20221115T223603Z</version_modified>
+  <version_id>fad67fa1-ef05-4eea-bb44-8552e20c1a4c</version_id>
+  <version_modified>2024-07-11T14:32:07Z</version_modified>
   <xml_checksum>A8BAB05F</xml_checksum>
   <class_name>InjectIDFObjects</class_name>
   <display_name> Inject IDF Objects</display_name>
@@ -61,28 +61,10 @@ This measure works for when you just need to add new IDF objects. If you need to
   </attributes>
   <files>
     <file>
-      <filename>EnvelopeAndLoadTestModel_01.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>E11F67BD</checksum>
-    </file>
-    <file>
-      <filename>Example B - BlockEnergyCharge.idf</filename>
-      <filetype>idf</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F90DD242</checksum>
-    </file>
-    <file>
-      <filename>model_test.osw</filename>
-      <filetype>osw</filetype>
-      <usage_type>test</usage_type>
-      <checksum>F5FABCCF</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>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -91,10 +73,10 @@ This measure works for when you just need to add new IDF objects. If you need to
       <checksum>3D0882F2</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>64FFEBDE</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -105,13 +87,31 @@ 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>7BDE3C9B</checksum>
+      <checksum>AC4140F5</checksum>
+    </file>
+    <file>
+      <filename>EnvelopeAndLoadTestModel_01.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>E11F67BD</checksum>
+    </file>
+    <file>
+      <filename>Example B - BlockEnergyCharge.idf</filename>
+      <filetype>idf</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F90DD242</checksum>
     </file>
     <file>
       <filename>measure_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>B0776CD6</checksum>
+      <checksum>88C69467</checksum>
+    </file>
+    <file>
+      <filename>model_test.osw</filename>
+      <filetype>osw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>F5FABCCF</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/openstudio_results/measure.rb

@@ -6,11 +6,6 @@
 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_relative 'resources/Siz.Model'
@@ -213,7 +208,8 @@ class OpenStudioResults < OpenStudio::Measure::ReportingMeasure
     web_asset_path = setup[:web_asset_path]
 
     # assign the user inputs to variables
-    args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments)
+    args = runner.getArgumentValues(arguments, user_arguments)
+    args = Hash[args.collect{ |k, v| [k.to_s, v] }]
     unless args
       return false
     end