openstudio-calibration 0.9.0 → 0.11.0

data/lib/measures/TimeseriesObjectiveFunction/measure.rb

@@ -290,22 +290,22 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
       js_time = js_time.gsub('Sep', '09')
       js_time = js_time.gsub('Oct', '10')
       js_time = js_time.gsub('Nov', '11')
-      js_time = js_time.gsub('Dec', '12')
-
-      js_time
+      js_time.gsub('Dec', '12')
     end
 
     # setup convert
-    if convert_data == 'F to C'
+    case convert_data
+    when 'F to C'
       convert = 0.5556
-    elsif convert_data == 'WH to J'
+    when 'WH to J'
       convert = 3600
-    elsif convert_data == 'CFM to m3/s'
+    when 'CFM to m3/s'
       convert = 0.00047
-    elsif convert_data == 'PSI to Pa'
+    when 'PSI to Pa'
       convert = 6894.76
-    else convert_data == 'None'
-         convert = 1
+    else
+      convert_data == 'None'
+      convert = 1
     end
 
     diff = 0.0
@@ -428,13 +428,13 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
              "+0#{tzs.to_i}:00"
            else # two digit
              "+#{tzs.to_i}:00"
-                end
+           end
          else # negative number
            if tzs.to_i * -1 < 10 # one digit
              "-0#{tzs.to_i * -1}:00"
            else # two digit
              "-#{tzs.to_i * -1}:00"
-                end
+           end
          end
     runner.registerInfo("timezone = #{tz}")
     # export for plotting
@@ -501,6 +501,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
 
           csv.each_index do |row|
             next unless row > 0
+
             if csv[row][0].nil?
               if warning_messages
                 runner.registerWarning("empty csv row number #{row}")
@@ -516,7 +517,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
             if year.nil?
               dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]), day)
             else
-              dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]),day,year)
+              dat = OpenStudio::Date.new(OpenStudio::MonthOfYear.new(cal[mon]), day, year)
             end
             tim = if sec.nil?
                     OpenStudio::Time.new(0, hou, min, 0)
@@ -550,6 +551,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
             runner.registerInfo("dtm: #{dtm}") if verbose_messages
             csv[row].each_index do |col|
               next unless col > 0
+
               mtr = csv[row][col].to_s
               # try converting
               if convert == 0.5556 # this is a temperature
@@ -568,6 +570,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
                 end
               end
               next unless csv[0][col] == hdr
+
               sim = ser.value(dtm)
               # store timeseries for plotting
               point = {}
@@ -579,9 +582,10 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
               point2['time'] = to_JSTime(dtm)
               data2 << point2
 
-              dif = if norm == 1
+              dif = case norm
+                    when 1
                       scale.to_f * (mtr.to_f - sim.to_f).abs
-                    elsif norm == 2
+                    when 2
                       (scale.to_f * (mtr.to_f - sim.to_f))**2
                     else
                       scale.to_f * (mtr.to_f - sim.to_f)
@@ -606,6 +610,7 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
           end
           # add 0 for plotting
           next unless last_zero
+
           runner.registerInfo("add last_zero: #{last_date + delta}")
           point = {}
           point['y'] = 0.0
@@ -654,15 +659,13 @@ class TimeseriesObjectiveFunction < OpenStudio::Measure::ReportingMeasure
     FileUtils.mkdir_p(File.dirname("allseries_#{csv_var}.json")) unless Dir.exist?(File.dirname("allseries_#{csv_var}.json"))
     File.open("allseries_#{csv_var}.json", 'wb') { |f| f << JSON.pretty_generate(all_series) }
     # check if analysis directory exists on server
-    if algorithm_download
-      if File.basename(File.expand_path(File.join(Dir.pwd, '../../../'))).split('_')[0] == 'analysis'
-        runner.registerInfo("Copying timeseries_#{csv_var}.json to downloads directory")
-        directory_name = File.expand_path(File.join(Dir.pwd, '../../../downloads'))
-        Dir.mkdir(directory_name) unless File.exist?(directory_name)
-        FileUtils.cp("timeseries_#{csv_var}.json", directory_name)
-        FileUtils.cp("allseries_#{csv_var}.json", directory_name)
-        FileUtils.cp("timeseries_#{plot_name}.csv", directory_name)
-      end
+    if algorithm_download && (File.basename(File.expand_path(File.join(Dir.pwd, '../../../'))).split('_')[0] == 'analysis')
+      runner.registerInfo("Copying timeseries_#{csv_var}.json to downloads directory")
+      directory_name = File.expand_path(File.join(Dir.pwd, '../../../downloads'))
+      Dir.mkdir(directory_name) unless File.exist?(directory_name)
+      FileUtils.cp("timeseries_#{csv_var}.json", directory_name)
+      FileUtils.cp("allseries_#{csv_var}.json", directory_name)
+      FileUtils.cp("timeseries_#{plot_name}.csv", directory_name)
     end
     diff = Math.sqrt(diff) if norm == 2
 

data/lib/measures/TimeseriesObjectiveFunction/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>timeseries_objective_function</name>
   <uid>6804217d-4737-45f3-82df-b81393c29ce4</uid>
-  <version_id>aa90f481-25bf-4ba0-a6cd-ceece394f503</version_id>
-  <version_modified>2023-10-11T15:24:04Z</version_modified>
+  <version_id>6073bda9-1d2d-4b87-8117-1f763eec41b4</version_id>
+  <version_modified>2024-11-16T23:44:47Z</version_modified>
   <xml_checksum>FFE04372</xml_checksum>
   <class_name>TimeseriesObjectiveFunction</class_name>
   <display_name>TimeSeries Objective Function</display_name>
@@ -118,12 +118,12 @@
     </argument>
     <argument>
       <name>key_value</name>
-      <display_name>SQL key value</display_name>
+      <display_name>SQL key value. use no_key if there is no key, i.e. Electricity:Facility</display_name>
       <description>SQL key value for the SQL query to find the variable in the SQL file</description>
       <type>String</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value></default_value>
+      <default_value>no_key</default_value>
     </argument>
     <argument>
       <name>timeseries_name</name>
@@ -141,14 +141,15 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
+      <default_value>Zone Timestep</default_value>
       <choices>
         <choice>
           <value>Detailed</value>
           <display_name>Detailed</display_name>
         </choice>
         <choice>
-          <value>Timestep</value>
-          <display_name>Timestep</display_name>
+          <value>Zone Timestep</value>
+          <display_name>Zone Timestep</display_name>
         </choice>
         <choice>
           <value>Hourly</value>
@@ -401,19 +402,13 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <checksum>8696A072</checksum>
     </file>
     <file>
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>1A2DB569</checksum>
-    </file>
-    <file>
-      <filename>README.md.erb</filename>
-      <filetype>erb</filetype>
-      <usage_type>readmeerb</usage_type>
-      <checksum>703C9964</checksum>
+      <checksum>B22335D9</checksum>
     </file>
     <file>
       <version>
@@ -424,13 +419,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>C6A94521</checksum>
+      <checksum>27254D71</checksum>
     </file>
     <file>
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>062A5AA5</checksum>
+      <checksum>8FAA542D</checksum>
     </file>
     <file>
       <filename>timeseries_data.csv</filename>

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

@@ -17,6 +17,9 @@
 
 
 
+
+
+
 <!DOCTYPE html>
 <meta charset="utf-8">
 <style>

data/lib/measures/TimeseriesPlot/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/TimeseriesPlot/measure.rb

@@ -156,9 +156,7 @@ class TimeseriesPlot < OpenStudio::Measure::ReportingMeasure
       js_time = js_time.gsub('Sep', '09')
       js_time = js_time.gsub('Oct', '10')
       js_time = js_time.gsub('Nov', '11')
-      js_time = js_time.gsub('Dec', '12')
-
-      js_time
+      js_time.gsub('Dec', '12')
     end
 
     # Create an array of arrays of variables

data/lib/measures/TimeseriesPlot/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>timeseries_plot</name>
   <uid>6804217d-4737-45f3-82df-b81393c29ce7</uid>
-  <version_id>f0dc56b0-b629-4d47-8199-e96f2fb76b06</version_id>
-  <version_modified>20230602T154653Z</version_modified>
+  <version_id>c9abd4ba-0c57-4ed2-85b7-966551ab80ad</version_id>
+  <version_modified>2024-11-16T23:44:47Z</version_modified>
   <xml_checksum>FFE04372</xml_checksum>
   <class_name>TimeseriesPlot</class_name>
   <display_name>Timeseries Plot</display_name>
@@ -100,10 +100,10 @@
   </attributes>
   <files>
     <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>8696A072</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -112,10 +112,10 @@
       <checksum>A3A04D6D</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -126,13 +126,13 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>33C8E26E</checksum>
+      <checksum>63FBC662</checksum>
     </file>
     <file>
       <filename>report.html.erb</filename>
       <filetype>erb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>F5B9FC62</checksum>
+      <checksum>A8E90964</checksum>
     </file>
   </files>
 </measure>

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

@@ -17,6 +17,9 @@
 
 
 
+
+
+
 <!DOCTYPE html>
 <meta charset="utf-8">
 <style>

data/lib/measures/WaterHeaterMixedMultiplier/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/WaterHeaterMixedMultiplier/measure.rb

@@ -166,33 +166,27 @@ class WaterHeaterMixedMultiplier < OpenStudio::Measure::ModelMeasure
     water_heaters.each do |water_heater|
       altered_heater = false
       # modify maximum_capacity_multiplier
-      if maximum_capacity_multiplier != 1.0
-        if water_heater.heaterMaximumCapacity.is_initialized
-          runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity multiplier to #{water_heater.name.get}.")
-          water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier)
-          altered_max_cap << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if maximum_capacity_multiplier != 1.0 && water_heater.heaterMaximumCapacity.is_initialized
+        runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity multiplier to #{water_heater.name.get}.")
+        water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier)
+        altered_max_cap << water_heater.handle.to_s
+        altered_heater = true
       end
 
       # modify minimum_capacity_multiplier
-      if minimum_capacity_multiplier != 1.0
-        if water_heater.heaterMinimumCapacity.is_initialized
-          runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity multiplier to #{water_heater.name.get}.")
-          water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier)
-          altered_min_cap << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if minimum_capacity_multiplier != 1.0 && water_heater.heaterMinimumCapacity.is_initialized
+        runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity multiplier to #{water_heater.name.get}.")
+        water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier)
+        altered_min_cap << water_heater.handle.to_s
+        altered_heater = true
       end
 
       # modify thermal_efficiency_multiplier
-      if thermal_efficiency_multiplier != 1.0
-        if water_heater.heaterThermalEfficiency.is_initialized
-          runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency multiplier to #{water_heater.name.get}.")
-          water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier)
-          altered_thermalefficiency << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if thermal_efficiency_multiplier != 1.0 && water_heater.heaterThermalEfficiency.is_initialized
+        runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency multiplier to #{water_heater.name.get}.")
+        water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier)
+        altered_thermalefficiency << water_heater.handle.to_s
+        altered_heater = true
       end
 
       orig_fuel_type = water_heater.heaterFuelType
@@ -203,10 +197,11 @@ class WaterHeaterMixedMultiplier < OpenStudio::Measure::ModelMeasure
       end
 
       next unless altered_heater
+
       altered_heaters << water_heater.handle.to_s
       change_name(water_heater, maximum_capacity_multiplier, minimum_capacity_multiplier, thermal_efficiency_multiplier, fuel_type, orig_fuel_type)
       runner.registerInfo("WaterHeater name changed to: #{water_heater.name.get}")
-    end # end water_heater loop
+    end
 
     # na if nothing in model to look at
     if altered_heaters.empty?

data/lib/measures/WaterHeaterMixedMultiplier/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>water_heater_mixed_multiplier</name>
   <uid>1e4d5053-d2c1-400d-9192-7a470e5a7b5c</uid>
-  <version_id>b37dc7d6-7369-471c-999b-3b7e37bc62d7</version_id>
-  <version_modified>20230602T154652Z</version_modified>
+  <version_id>0375b022-c462-4d57-a7e8-e8b6d4dfc981</version_id>
+  <version_modified>2024-11-16T23:44:47Z</version_modified>
   <xml_checksum>D28BCE9C</xml_checksum>
   <class_name>WaterHeaterMixedMultiplier</class_name>
   <display_name>Water Heater Mixed Multiplier</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{324fe7dc-cc2a-433e-90bb-45cc50d3759b}</default_value>
+      <default_value>{2bf3b8d6-35ac-4c06-8a3b-fc00fb3573e3}</default_value>
       <choices>
         <choice>
-          <value>{324fe7dc-cc2a-433e-90bb-45cc50d3759b}</value>
+          <value>{2bf3b8d6-35ac-4c06-8a3b-fc00fb3573e3}</value>
           <display_name>*All WaterHeaterMixeds*</display_name>
         </choice>
         <choice>
@@ -150,10 +150,10 @@
   </attributes>
   <files>
     <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>8696A072</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -162,10 +162,10 @@
       <checksum>1626F8CE</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -176,7 +176,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>ADA82976</checksum>
+      <checksum>70B22ACC</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/WaterHeaterMixedPercentChange/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/WaterHeaterMixedPercentChange/measure.rb

@@ -156,33 +156,27 @@ class WaterHeaterMixedPercentChange < OpenStudio::Measure::ModelMeasure
     water_heaters.each do |water_heater|
       altered_heater = false
       # modify maximum_capacity_multiplier
-      if maximum_capacity_multiplier != 0.0
-        if water_heater.heaterMaximumCapacity.is_initialized
-          runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity Percent Change to #{water_heater.name.get}.")
-          water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get + water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier * 0.01)
-          altered_max_cap << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if maximum_capacity_multiplier != 0.0 && water_heater.heaterMaximumCapacity.is_initialized
+        runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity Percent Change to #{water_heater.name.get}.")
+        water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get + water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier * 0.01)
+        altered_max_cap << water_heater.handle.to_s
+        altered_heater = true
       end
 
       # modify minimum_capacity_multiplier
-      if minimum_capacity_multiplier != 0.0
-        if water_heater.heaterMinimumCapacity.is_initialized
-          runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity Percent Change to #{water_heater.name.get}.")
-          water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get + water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier * 0.01)
-          altered_min_cap << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if minimum_capacity_multiplier != 0.0 && water_heater.heaterMinimumCapacity.is_initialized
+        runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity Percent Change to #{water_heater.name.get}.")
+        water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get + water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier * 0.01)
+        altered_min_cap << water_heater.handle.to_s
+        altered_heater = true
       end
 
       # modify thermal_efficiency_multiplier
-      if thermal_efficiency_multiplier != 0.0
-        if water_heater.heaterThermalEfficiency.is_initialized
-          runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency Percent Change to #{water_heater.name.get}.")
-          water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get + water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier * 0.01)
-          altered_thermalefficiency << water_heater.handle.to_s
-          altered_heater = true
-        end
+      if thermal_efficiency_multiplier != 0.0 && water_heater.heaterThermalEfficiency.is_initialized
+        runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency Percent Change to #{water_heater.name.get}.")
+        water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get + water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier * 0.01)
+        altered_thermalefficiency << water_heater.handle.to_s
+        altered_heater = true
       end
 
       orig_fuel_type = water_heater.heaterFuelType
@@ -193,10 +187,11 @@ class WaterHeaterMixedPercentChange < OpenStudio::Measure::ModelMeasure
       end
 
       next unless altered_heater
+
       altered_heaters << water_heater.handle.to_s
       change_name(water_heater, maximum_capacity_multiplier, minimum_capacity_multiplier, thermal_efficiency_multiplier, fuel_type, orig_fuel_type)
       runner.registerInfo("WaterHeater name changed to: #{water_heater.name.get}")
-    end # end water_heater loop
+    end
 
     # na if nothing in model to look at
     if altered_heaters.empty?

data/lib/measures/WaterHeaterMixedPercentChange/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>water_heater_mixed_percent_change</name>
   <uid>c42bf4e7-2bbb-44c6-ab91-e6ddb53e050d</uid>
-  <version_id>63f5274b-2240-4fe7-aee5-2b96309f435e</version_id>
-  <version_modified>20230602T154657Z</version_modified>
+  <version_id>f87b5fda-5921-4e18-9fd4-d2be490d114a</version_id>
+  <version_modified>2024-11-16T23:44:49Z</version_modified>
   <xml_checksum>D28BCE9C</xml_checksum>
   <class_name>WaterHeaterMixedPercentChange</class_name>
   <display_name>Water Heater Mixed Percent Change</display_name>
@@ -17,10 +17,10 @@
       <type>Choice</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
-      <default_value>{978271ac-8723-4076-ab28-6cc9c2da6144}</default_value>
+      <default_value>{6fbcfefd-4896-4443-ae11-ee5cbf866e6e}</default_value>
       <choices>
         <choice>
-          <value>{978271ac-8723-4076-ab28-6cc9c2da6144}</value>
+          <value>{6fbcfefd-4896-4443-ae11-ee5cbf866e6e}</value>
           <display_name>*All WaterHeaterMixeds*</display_name>
         </choice>
         <choice>
@@ -150,10 +150,10 @@
   </attributes>
   <files>
     <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>8696A072</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -162,10 +162,10 @@
       <checksum>04987893</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <filename>README.md.erb</filename>
+      <filetype>erb</filetype>
+      <usage_type>readmeerb</usage_type>
+      <checksum>703C9964</checksum>
     </file>
     <file>
       <version>
@@ -176,7 +176,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>2831FFEF</checksum>
+      <checksum>CE10E4B6</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/inspect_and_edit_parametric_schedules/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2023 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/inspect_and_edit_parametric_schedules/measure.rb

@@ -10,10 +10,6 @@
 
 require 'openstudio-standards'
 
-# load OpenStudio measure libraries from openstudio-extension gem
-require 'openstudio-extension'
-require 'openstudio/extension/core/os_lib_helper_methods'
-
 # start the measure
 class InspectAndEditParametricSchedules < OpenStudio::Measure::ModelMeasure
   # human readable name
@@ -120,11 +116,15 @@ class InspectAndEditParametricSchedules < 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
+      
+    # open channel to log messages
+    reset_log
 
-    # setup log messages that will come from standards
-    OsLib_HelperMethods.setup_log_msgs(runner, true) # bool is debug
+    # Turn debugging output on/off
+    debug = false
 
     # load standards
     standard = Standard.build('90.1-2004') # selected template doesn't matter
@@ -174,17 +174,19 @@ class InspectAndEditParametricSchedules < OpenStudio::Measure::ModelMeasure
     # report initial condition of model
     runner.registerInitialCondition("The building started with #{counter_parametric_schedules.uniq.size.size} parametric schedules.")
 
-    #   if requested re-generate schedules
+    # if requested re-generate schedules
     if args['apply_parametric_sch']
-      parametric_schedules = standard.model_apply_parametric_schedules(model, ramp_frequency: nil, infer_hoo_for_non_assigned_objects: true, error_on_out_of_order: true)
+      parametric_schedules = OpenstudioStandards::Schedules.model_apply_parametric_schedules(model, ramp_frequency: nil, infer_hoo_for_non_assigned_objects: true, error_on_out_of_order: true)
       runner.registerInfo("Applying #{parametric_schedules.size} parametric schedules.")
     end
 
     # report final condition of model
     runner.registerFinalCondition("The building finished with #{parametric_schedules.size} parametric schedules.")
 
-    # report log messages from standards
-    OsLib_HelperMethods.log_msgs
+    # gather log
+    log_messages_to_runner(runner, debug)
+    reset_log
+    
 
     return true
   end