openstudio-calibration 0.9.0 → 0.10.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (77) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/Gemfile +1 -1
  4. data/Jenkinsfile +1 -1
  5. data/Rakefile +3 -0
  6. data/lib/measures/AddMonthlyJSONUtilityData/measure.rb +3 -3
  7. data/lib/measures/AddMonthlyJSONUtilityData/measure.xml +3 -3
  8. data/lib/measures/AddMonthlyUtilityData/measure.xml +8 -8
  9. data/lib/measures/CalibrationReports/measure.rb +1 -3
  10. data/lib/measures/CalibrationReports/measure.xml +4 -4
  11. data/lib/measures/CalibrationReportsEnhanced/measure.rb +21 -22
  12. data/lib/measures/CalibrationReportsEnhanced/measure.xml +4 -4
  13. data/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.rb +12 -12
  14. data/lib/measures/CoilCoolingDXSingleSpeedMultiplier/measure.xml +5 -5
  15. data/lib/measures/CoilCoolingDXSingleSpeedPercentChange/measure.rb +12 -12
  16. data/lib/measures/CoilCoolingDXSingleSpeedPercentChange/measure.xml +5 -5
  17. data/lib/measures/CoilCoolingDXTwoSpeedMultiplier/measure.rb +21 -23
  18. data/lib/measures/CoilCoolingDXTwoSpeedMultiplier/measure.xml +5 -5
  19. data/lib/measures/CoilCoolingDXTwoSpeedPercentChange/measure.rb +21 -23
  20. data/lib/measures/CoilCoolingDXTwoSpeedPercentChange/measure.xml +5 -5
  21. data/lib/measures/CoilCoolingWaterMultiplier/measure.rb +33 -43
  22. data/lib/measures/CoilCoolingWaterMultiplier/measure.xml +5 -5
  23. data/lib/measures/CoilCoolingWaterPercentChange/measure.rb +33 -43
  24. data/lib/measures/CoilCoolingWaterPercentChange/measure.xml +5 -5
  25. data/lib/measures/CoilHeatingElectricMultiplier/measure.rb +8 -8
  26. data/lib/measures/CoilHeatingElectricMultiplier/measure.xml +5 -5
  27. data/lib/measures/CoilHeatingElectricPercentChange/measure.rb +8 -8
  28. data/lib/measures/CoilHeatingElectricPercentChange/measure.xml +5 -5
  29. data/lib/measures/CoilHeatingGasMultiplier/measure.rb +8 -8
  30. data/lib/measures/CoilHeatingGasMultiplier/measure.xml +5 -5
  31. data/lib/measures/CoilHeatingGasPercentChange/measure.rb +8 -8
  32. data/lib/measures/CoilHeatingGasPercentChange/measure.xml +5 -5
  33. data/lib/measures/CoilHeatingWaterMultiplier/measure.rb +13 -15
  34. data/lib/measures/CoilHeatingWaterMultiplier/measure.xml +5 -5
  35. data/lib/measures/CoilHeatingWaterPercentChange/measure.rb +13 -15
  36. data/lib/measures/CoilHeatingWaterPercentChange/measure.xml +5 -5
  37. data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.rb +4 -4
  38. data/lib/measures/ConstructionLayerZeroMaterialProperties/measure.xml +3 -3
  39. data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.rb +8 -5
  40. data/lib/measures/ExteriorWallThermalPropertiesMultiplier/measure.xml +9 -9
  41. data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.rb +8 -5
  42. data/lib/measures/ExteriorWallThermalPropertiesPercentChange/measure.xml +9 -9
  43. data/lib/measures/FansMultiplier/measure.rb +8 -8
  44. data/lib/measures/FansMultiplier/measure.xml +5 -5
  45. data/lib/measures/FansPercentChange/measure.rb +8 -8
  46. data/lib/measures/FansPercentChange/measure.xml +5 -5
  47. data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.rb +2 -2
  48. data/lib/measures/GeneralCalibrationMeasureMultiplier/measure.xml +7 -7
  49. data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.rb +2 -2
  50. data/lib/measures/GeneralCalibrationMeasurePercentChange/measure.xml +7 -7
  51. data/lib/measures/HardSizeHvac/measure.rb +2 -4
  52. data/lib/measures/HardSizeHvac/measure.xml +4 -4
  53. data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.rb +7 -9
  54. data/lib/measures/RValueOfInsulationForConstructionMultiplier/measure.xml +3 -3
  55. data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.rb +7 -9
  56. data/lib/measures/RValueOfInsulationForConstructionPercentageChange/measure.xml +3 -3
  57. data/lib/measures/RoofThermalPropertiesMultiplier/measure.rb +8 -5
  58. data/lib/measures/RoofThermalPropertiesMultiplier/measure.xml +9 -9
  59. data/lib/measures/RoofThermalPropertiesPercentChange/measure.rb +8 -5
  60. data/lib/measures/RoofThermalPropertiesPercentChange/measure.xml +9 -9
  61. data/lib/measures/TimeseriesObjectiveFunction/measure.rb +26 -23
  62. data/lib/measures/TimeseriesObjectiveFunction/measure.xml +10 -15
  63. data/lib/measures/TimeseriesObjectiveFunction/resources/report.html.erb +3 -0
  64. data/lib/measures/TimeseriesPlot/measure.rb +1 -3
  65. data/lib/measures/TimeseriesPlot/measure.xml +13 -13
  66. data/lib/measures/TimeseriesPlot/resources/report.html.erb +3 -0
  67. data/lib/measures/WaterHeaterMixedMultiplier/measure.rb +17 -22
  68. data/lib/measures/WaterHeaterMixedMultiplier/measure.xml +5 -5
  69. data/lib/measures/WaterHeaterMixedPercentChange/measure.rb +17 -22
  70. data/lib/measures/WaterHeaterMixedPercentChange/measure.xml +5 -5
  71. data/lib/measures/inspect_and_edit_parametric_schedules/measure.rb +13 -11
  72. data/lib/measures/inspect_and_edit_parametric_schedules/measure.xml +29 -29
  73. data/lib/measures/shift_hours_of_operation/measure.rb +31 -29
  74. data/lib/measures/shift_hours_of_operation/measure.xml +51 -37
  75. data/lib/openstudio/calibration/version.rb +1 -1
  76. data/openstudio-calibration.gemspec +13 -6
  77. metadata +69 -13
data/lib/measures/TimeseriesObjectiveFunction/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.1</schema_version>
4
4
  <name>timeseries_objective_function</name>
5
5
  <uid>6804217d-4737-45f3-82df-b81393c29ce4</uid>
6
- <version_id>aa90f481-25bf-4ba0-a6cd-ceece394f503</version_id>
7
- <version_modified>2023-10-11T15:24:04Z</version_modified>
6
+ <version_id>23e1b99b-044e-456b-b6fe-8d53c3cf9417</version_id>
7
+ <version_modified>2024-07-11T19:58:13Z</version_modified>
8
8
  <xml_checksum>FFE04372</xml_checksum>
9
9
  <class_name>TimeseriesObjectiveFunction</class_name>
10
10
  <display_name>TimeSeries Objective Function</display_name>
@@ -118,12 +118,12 @@
118
118
  </argument>
119
119
  <argument>
120
120
  <name>key_value</name>
121
- <display_name>SQL key value</display_name>
121
+ <display_name>SQL key value. use no_key if there is no key, i.e. Electricity:Facility</display_name>
122
122
  <description>SQL key value for the SQL query to find the variable in the SQL file</description>
123
123
  <type>String</type>
124
124
  <required>true</required>
125
125
  <model_dependent>false</model_dependent>
126
- <default_value></default_value>
126
+ <default_value>no_key</default_value>
127
127
  </argument>
128
128
  <argument>
129
129
  <name>timeseries_name</name>
@@ -141,14 +141,15 @@
141
141
  <type>Choice</type>
142
142
  <required>true</required>
143
143
  <model_dependent>false</model_dependent>
144
+ <default_value>Zone Timestep</default_value>
144
145
  <choices>
145
146
  <choice>
146
147
  <value>Detailed</value>
147
148
  <display_name>Detailed</display_name>
148
149
  </choice>
149
150
  <choice>
150
- <value>Timestep</value>
151
- <display_name>Timestep</display_name>
151
+ <value>Zone Timestep</value>
152
+ <display_name>Zone Timestep</display_name>
152
153
  </choice>
153
154
  <choice>
154
155
  <value>Hourly</value>
@@ -407,13 +408,7 @@
407
408
  <filename>README.md</filename>
408
409
  <filetype>md</filetype>
409
410
  <usage_type>readme</usage_type>
410
- <checksum>1A2DB569</checksum>
411
- </file>
412
- <file>
413
- <filename>README.md.erb</filename>
414
- <filetype>erb</filetype>
415
- <usage_type>readmeerb</usage_type>
416
- <checksum>703C9964</checksum>
411
+ <checksum>B22335D9</checksum>
417
412
  </file>
418
413
  <file>
419
414
  <version>
@@ -424,13 +419,13 @@
424
419
  <filename>measure.rb</filename>
425
420
  <filetype>rb</filetype>
426
421
  <usage_type>script</usage_type>
427
- <checksum>C6A94521</checksum>
422
+ <checksum>27254D71</checksum>
428
423
  </file>
429
424
  <file>
430
425
  <filename>report.html.erb</filename>
431
426
  <filetype>erb</filetype>
432
427
  <usage_type>resource</usage_type>
433
- <checksum>062A5AA5</checksum>
428
+ <checksum>8FAA542D</checksum>
434
429
  </file>
435
430
  <file>
436
431
  <filename>timeseries_data.csv</filename>
data/lib/measures/TimeseriesObjectiveFunction/resources/report.html.erb CHANGED
@@ -17,6 +17,9 @@
17
17
 
18
18
 
19
19
 
20
+
21
+
22
+
20
23
  <!DOCTYPE html>
21
24
  <meta charset="utf-8">
22
25
  <style>
data/lib/measures/TimeseriesPlot/measure.rb CHANGED
@@ -156,9 +156,7 @@ class TimeseriesPlot < OpenStudio::Measure::ReportingMeasure
156
156
  js_time = js_time.gsub('Sep', '09')
157
157
  js_time = js_time.gsub('Oct', '10')
158
158
  js_time = js_time.gsub('Nov', '11')
159
- js_time = js_time.gsub('Dec', '12')
160
-
161
- js_time
159
+ js_time.gsub('Dec', '12')
162
160
  end
163
161
 
164
162
  # Create an array of arrays of variables
data/lib/measures/TimeseriesPlot/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>timeseries_plot</name>
5
5
  <uid>6804217d-4737-45f3-82df-b81393c29ce7</uid>
6
- <version_id>f0dc56b0-b629-4d47-8199-e96f2fb76b06</version_id>
7
- <version_modified>20230602T154653Z</version_modified>
6
+ <version_id>18f2eb4b-8ea6-492b-9eec-189733d7a975</version_id>
7
+ <version_modified>2024-07-11T19:58:13Z</version_modified>
8
8
  <xml_checksum>FFE04372</xml_checksum>
9
9
  <class_name>TimeseriesPlot</class_name>
10
10
  <display_name>Timeseries Plot</display_name>
@@ -100,10 +100,10 @@
100
100
  </attributes>
101
101
  <files>
102
102
  <file>
103
- <filename>README.md.erb</filename>
104
- <filetype>erb</filetype>
105
- <usage_type>readmeerb</usage_type>
106
- <checksum>703C9964</checksum>
103
+ <filename>LICENSE.md</filename>
104
+ <filetype>md</filetype>
105
+ <usage_type>license</usage_type>
106
+ <checksum>BFFB1AA6</checksum>
107
107
  </file>
108
108
  <file>
109
109
  <filename>README.md</filename>
@@ -112,10 +112,10 @@
112
112
  <checksum>A3A04D6D</checksum>
113
113
  </file>
114
114
  <file>
115
- <filename>LICENSE.md</filename>
116
- <filetype>md</filetype>
117
- <usage_type>license</usage_type>
118
- <checksum>BFFB1AA6</checksum>
115
+ <filename>README.md.erb</filename>
116
+ <filetype>erb</filetype>
117
+ <usage_type>readmeerb</usage_type>
118
+ <checksum>703C9964</checksum>
119
119
  </file>
120
120
  <file>
121
121
  <version>
@@ -126,13 +126,13 @@
126
126
  <filename>measure.rb</filename>
127
127
  <filetype>rb</filetype>
128
128
  <usage_type>script</usage_type>
129
- <checksum>33C8E26E</checksum>
129
+ <checksum>63FBC662</checksum>
130
130
  </file>
131
131
  <file>
132
132
  <filename>report.html.erb</filename>
133
133
  <filetype>erb</filetype>
134
134
  <usage_type>resource</usage_type>
135
- <checksum>F5B9FC62</checksum>
135
+ <checksum>A8E90964</checksum>
136
136
  </file>
137
137
  </files>
138
138
  </measure>
data/lib/measures/TimeseriesPlot/resources/report.html.erb CHANGED
@@ -17,6 +17,9 @@
17
17
 
18
18
 
19
19
 
20
+
21
+
22
+
20
23
  <!DOCTYPE html>
21
24
  <meta charset="utf-8">
22
25
  <style>
data/lib/measures/WaterHeaterMixedMultiplier/measure.rb CHANGED
@@ -166,33 +166,27 @@ class WaterHeaterMixedMultiplier < OpenStudio::Measure::ModelMeasure
166
166
  water_heaters.each do |water_heater|
167
167
  altered_heater = false
168
168
  # modify maximum_capacity_multiplier
169
- if maximum_capacity_multiplier != 1.0
170
- if water_heater.heaterMaximumCapacity.is_initialized
171
- runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity multiplier to #{water_heater.name.get}.")
172
- water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier)
173
- altered_max_cap << water_heater.handle.to_s
174
- altered_heater = true
175
- end
169
+ if maximum_capacity_multiplier != 1.0 && water_heater.heaterMaximumCapacity.is_initialized
170
+ runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity multiplier to #{water_heater.name.get}.")
171
+ water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier)
172
+ altered_max_cap << water_heater.handle.to_s
173
+ altered_heater = true
176
174
  end
177
175
 
178
176
  # modify minimum_capacity_multiplier
179
- if minimum_capacity_multiplier != 1.0
180
- if water_heater.heaterMinimumCapacity.is_initialized
181
- runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity multiplier to #{water_heater.name.get}.")
182
- water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier)
183
- altered_min_cap << water_heater.handle.to_s
184
- altered_heater = true
185
- end
177
+ if minimum_capacity_multiplier != 1.0 && water_heater.heaterMinimumCapacity.is_initialized
178
+ runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity multiplier to #{water_heater.name.get}.")
179
+ water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier)
180
+ altered_min_cap << water_heater.handle.to_s
181
+ altered_heater = true
186
182
  end
187
183
 
188
184
  # modify thermal_efficiency_multiplier
189
- if thermal_efficiency_multiplier != 1.0
190
- if water_heater.heaterThermalEfficiency.is_initialized
191
- runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency multiplier to #{water_heater.name.get}.")
192
- water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier)
193
- altered_thermalefficiency << water_heater.handle.to_s
194
- altered_heater = true
195
- end
185
+ if thermal_efficiency_multiplier != 1.0 && water_heater.heaterThermalEfficiency.is_initialized
186
+ runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency multiplier to #{water_heater.name.get}.")
187
+ water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier)
188
+ altered_thermalefficiency << water_heater.handle.to_s
189
+ altered_heater = true
196
190
  end
197
191
 
198
192
  orig_fuel_type = water_heater.heaterFuelType
@@ -203,10 +197,11 @@ class WaterHeaterMixedMultiplier < OpenStudio::Measure::ModelMeasure
203
197
  end
204
198
 
205
199
  next unless altered_heater
200
+
206
201
  altered_heaters << water_heater.handle.to_s
207
202
  change_name(water_heater, maximum_capacity_multiplier, minimum_capacity_multiplier, thermal_efficiency_multiplier, fuel_type, orig_fuel_type)
208
203
  runner.registerInfo("WaterHeater name changed to: #{water_heater.name.get}")
209
- end # end water_heater loop
204
+ end
210
205
 
211
206
  # na if nothing in model to look at
212
207
  if altered_heaters.empty?
data/lib/measures/WaterHeaterMixedMultiplier/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>water_heater_mixed_multiplier</name>
5
5
  <uid>1e4d5053-d2c1-400d-9192-7a470e5a7b5c</uid>
6
- <version_id>b37dc7d6-7369-471c-999b-3b7e37bc62d7</version_id>
7
- <version_modified>20230602T154652Z</version_modified>
6
+ <version_id>deea4bc3-594c-4458-adda-1d8d70df14e0</version_id>
7
+ <version_modified>20240428T231344Z</version_modified>
8
8
  <xml_checksum>D28BCE9C</xml_checksum>
9
9
  <class_name>WaterHeaterMixedMultiplier</class_name>
10
10
  <display_name>Water Heater Mixed Multiplier</display_name>
@@ -17,10 +17,10 @@
17
17
  <type>Choice</type>
18
18
  <required>true</required>
19
19
  <model_dependent>false</model_dependent>
20
- <default_value>{324fe7dc-cc2a-433e-90bb-45cc50d3759b}</default_value>
20
+ <default_value>{b674cf66-1b06-421e-aaf5-0e4b4dbfaa8d}</default_value>
21
21
  <choices>
22
22
  <choice>
23
- <value>{324fe7dc-cc2a-433e-90bb-45cc50d3759b}</value>
23
+ <value>{b674cf66-1b06-421e-aaf5-0e4b4dbfaa8d}</value>
24
24
  <display_name>*All WaterHeaterMixeds*</display_name>
25
25
  </choice>
26
26
  <choice>
@@ -176,7 +176,7 @@
176
176
  <filename>measure.rb</filename>
177
177
  <filetype>rb</filetype>
178
178
  <usage_type>script</usage_type>
179
- <checksum>ADA82976</checksum>
179
+ <checksum>70B22ACC</checksum>
180
180
  </file>
181
181
  </files>
182
182
  </measure>
data/lib/measures/WaterHeaterMixedPercentChange/measure.rb CHANGED
@@ -156,33 +156,27 @@ class WaterHeaterMixedPercentChange < OpenStudio::Measure::ModelMeasure
156
156
  water_heaters.each do |water_heater|
157
157
  altered_heater = false
158
158
  # modify maximum_capacity_multiplier
159
- if maximum_capacity_multiplier != 0.0
160
- if water_heater.heaterMaximumCapacity.is_initialized
161
- runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity Percent Change to #{water_heater.name.get}.")
162
- water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get + water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier * 0.01)
163
- altered_max_cap << water_heater.handle.to_s
164
- altered_heater = true
165
- end
159
+ if maximum_capacity_multiplier != 0.0 && water_heater.heaterMaximumCapacity.is_initialized
160
+ runner.registerInfo("Applying #{maximum_capacity_multiplier}x maximum capacity Percent Change to #{water_heater.name.get}.")
161
+ water_heater.setHeaterMaximumCapacity(water_heater.heaterMaximumCapacity.get + water_heater.heaterMaximumCapacity.get * maximum_capacity_multiplier * 0.01)
162
+ altered_max_cap << water_heater.handle.to_s
163
+ altered_heater = true
166
164
  end
167
165
 
168
166
  # modify minimum_capacity_multiplier
169
- if minimum_capacity_multiplier != 0.0
170
- if water_heater.heaterMinimumCapacity.is_initialized
171
- runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity Percent Change to #{water_heater.name.get}.")
172
- water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get + water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier * 0.01)
173
- altered_min_cap << water_heater.handle.to_s
174
- altered_heater = true
175
- end
167
+ if minimum_capacity_multiplier != 0.0 && water_heater.heaterMinimumCapacity.is_initialized
168
+ runner.registerInfo("Applying #{minimum_capacity_multiplier}x minimum capacity Percent Change to #{water_heater.name.get}.")
169
+ water_heater.setHeaterMaximumCapacity(water_heater.heaterMinimumCapacity.get + water_heater.heaterMinimumCapacity.get * minimum_capacity_multiplier * 0.01)
170
+ altered_min_cap << water_heater.handle.to_s
171
+ altered_heater = true
176
172
  end
177
173
 
178
174
  # modify thermal_efficiency_multiplier
179
- if thermal_efficiency_multiplier != 0.0
180
- if water_heater.heaterThermalEfficiency.is_initialized
181
- runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency Percent Change to #{water_heater.name.get}.")
182
- water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get + water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier * 0.01)
183
- altered_thermalefficiency << water_heater.handle.to_s
184
- altered_heater = true
185
- end
175
+ if thermal_efficiency_multiplier != 0.0 && water_heater.heaterThermalEfficiency.is_initialized
176
+ runner.registerInfo("Applying #{thermal_efficiency_multiplier}x thermal efficiency Percent Change to #{water_heater.name.get}.")
177
+ water_heater.setHeaterThermalEfficiency(water_heater.heaterThermalEfficiency.get + water_heater.heaterThermalEfficiency.get * thermal_efficiency_multiplier * 0.01)
178
+ altered_thermalefficiency << water_heater.handle.to_s
179
+ altered_heater = true
186
180
  end
187
181
 
188
182
  orig_fuel_type = water_heater.heaterFuelType
@@ -193,10 +187,11 @@ class WaterHeaterMixedPercentChange < OpenStudio::Measure::ModelMeasure
193
187
  end
194
188
 
195
189
  next unless altered_heater
190
+
196
191
  altered_heaters << water_heater.handle.to_s
197
192
  change_name(water_heater, maximum_capacity_multiplier, minimum_capacity_multiplier, thermal_efficiency_multiplier, fuel_type, orig_fuel_type)
198
193
  runner.registerInfo("WaterHeater name changed to: #{water_heater.name.get}")
199
- end # end water_heater loop
194
+ end
200
195
 
201
196
  # na if nothing in model to look at
202
197
  if altered_heaters.empty?
data/lib/measures/WaterHeaterMixedPercentChange/measure.xml CHANGED
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>water_heater_mixed_percent_change</name>
5
5
  <uid>c42bf4e7-2bbb-44c6-ab91-e6ddb53e050d</uid>
6
- <version_id>63f5274b-2240-4fe7-aee5-2b96309f435e</version_id>
7
- <version_modified>20230602T154657Z</version_modified>
6
+ <version_id>5a4c46fa-7fb4-4a4b-a51f-5055fd061518</version_id>
7
+ <version_modified>20240428T231349Z</version_modified>
8
8
  <xml_checksum>D28BCE9C</xml_checksum>
9
9
  <class_name>WaterHeaterMixedPercentChange</class_name>
10
10
  <display_name>Water Heater Mixed Percent Change</display_name>
@@ -17,10 +17,10 @@
17
17
  <type>Choice</type>
18
18
  <required>true</required>
19
19
  <model_dependent>false</model_dependent>
20
- <default_value>{978271ac-8723-4076-ab28-6cc9c2da6144}</default_value>
20
+ <default_value>{9fa48e19-3ce7-4149-85aa-b4d271b951ee}</default_value>
21
21
  <choices>
22
22
  <choice>
23
- <value>{978271ac-8723-4076-ab28-6cc9c2da6144}</value>
23
+ <value>{9fa48e19-3ce7-4149-85aa-b4d271b951ee}</value>
24
24
  <display_name>*All WaterHeaterMixeds*</display_name>
25
25
  </choice>
26
26
  <choice>
@@ -176,7 +176,7 @@
176
176
  <filename>measure.rb</filename>
177
177
  <filetype>rb</filetype>
178
178
  <usage_type>script</usage_type>
179
- <checksum>2831FFEF</checksum>
179
+ <checksum>CE10E4B6</checksum>
180
180
  </file>
181
181
  </files>
182
182
  </measure>
data/lib/measures/inspect_and_edit_parametric_schedules/measure.rb CHANGED
@@ -10,10 +10,6 @@
10
10
 
11
11
  require 'openstudio-standards'
12
12
 
13
- # load OpenStudio measure libraries from openstudio-extension gem
14
- require 'openstudio-extension'
15
- require 'openstudio/extension/core/os_lib_helper_methods'
16
-
17
13
  # start the measure
18
14
  class InspectAndEditParametricSchedules < OpenStudio::Measure::ModelMeasure
19
15
  # human readable name
@@ -120,11 +116,15 @@ class InspectAndEditParametricSchedules < OpenStudio::Measure::ModelMeasure
120
116
  super(model, runner, user_arguments)
121
117
 
122
118
  # assign the user inputs to variables
123
- args = OsLib_HelperMethods.createRunVariables(runner, model, user_arguments, arguments(model))
119
+ args = runner.getArgumentValues(arguments(model), user_arguments)
120
+ args = Hash[args.collect{ |k, v| [k.to_s, v] }]
124
121
  if !args then return false end
122
+
123
+ # open channel to log messages
124
+ reset_log
125
125
 
126
- # setup log messages that will come from standards
127
- OsLib_HelperMethods.setup_log_msgs(runner, true) # bool is debug
126
+ # Turn debugging output on/off
127
+ debug = false
128
128
 
129
129
  # load standards
130
130
  standard = Standard.build('90.1-2004') # selected template doesn't matter
@@ -174,17 +174,19 @@ class InspectAndEditParametricSchedules < OpenStudio::Measure::ModelMeasure
174
174
  # report initial condition of model
175
175
  runner.registerInitialCondition("The building started with #{counter_parametric_schedules.uniq.size.size} parametric schedules.")
176
176
 
177
- # if requested re-generate schedules
177
+ # if requested re-generate schedules
178
178
  if args['apply_parametric_sch']
179
- parametric_schedules = standard.model_apply_parametric_schedules(model, ramp_frequency: nil, infer_hoo_for_non_assigned_objects: true, error_on_out_of_order: true)
179
+ 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)
180
180
  runner.registerInfo("Applying #{parametric_schedules.size} parametric schedules.")
181
181
  end
182
182
 
183
183
  # report final condition of model
184
184
  runner.registerFinalCondition("The building finished with #{parametric_schedules.size} parametric schedules.")
185
185
 
186
- # report log messages from standards
187
- OsLib_HelperMethods.log_msgs
186
+ # gather log
187
+ log_messages_to_runner(runner, debug)
188
+ reset_log
189
+
188
190
 
189
191
  return true
190
192
  end
data/lib/measures/inspect_and_edit_parametric_schedules/measure.xml CHANGED
@@ -1,10 +1,10 @@
1
1
  <?xml version="1.0"?>
2
2
  <measure>
3
- <schema_version>3.0</schema_version>
3
+ <schema_version>3.1</schema_version>
4
4
  <name>inspect_and_edit_parametric_schedules</name>
5
5
  <uid>4b5f610d-caac-47c2-bd5b-610e2fc0768e</uid>
6
- <version_id>1d17e26a-5b3d-4d74-b5bb-7623dc3d5e3a</version_id>
7
- <version_modified>20230602T154656Z</version_modified>
6
+ <version_id>cbb5a3da-7152-4bb9-832c-7028f7eda960</version_id>
7
+ <version_modified>2024-07-11T19:58:13Z</version_modified>
8
8
  <xml_checksum>57318DBA</xml_checksum>
9
9
  <class_name>InspectAndEditParametricSchedules</class_name>
10
10
  <display_name>Inspect and Edit Parametric Schedules</display_name>
@@ -75,22 +75,10 @@
75
75
  </attributes>
76
76
  <files>
77
77
  <file>
78
- <filename>example_parametric_model.osm</filename>
79
- <filetype>osm</filetype>
80
- <usage_type>test</usage_type>
81
- <checksum>A0C68C28</checksum>
82
- </file>
83
- <file>
84
- <filename>apply_measures_now.png</filename>
85
- <filetype>png</filetype>
86
- <usage_type>doc</usage_type>
87
- <checksum>2D9A8051</checksum>
88
- </file>
89
- <file>
90
- <filename>README.md.erb</filename>
91
- <filetype>erb</filetype>
92
- <usage_type>readmeerb</usage_type>
93
- <checksum>F073FF6D</checksum>
78
+ <filename>LICENSE.md</filename>
79
+ <filetype>md</filetype>
80
+ <usage_type>license</usage_type>
81
+ <checksum>BFFB1AA6</checksum>
94
82
  </file>
95
83
  <file>
96
84
  <filename>README.md</filename>
@@ -99,27 +87,39 @@
99
87
  <checksum>A551610E</checksum>
100
88
  </file>
101
89
  <file>
102
- <filename>LICENSE.md</filename>
103
- <filetype>md</filetype>
104
- <usage_type>license</usage_type>
105
- <checksum>BFFB1AA6</checksum>
90
+ <filename>README.md.erb</filename>
91
+ <filetype>erb</filetype>
92
+ <usage_type>readmeerb</usage_type>
93
+ <checksum>F073FF6D</checksum>
106
94
  </file>
107
95
  <file>
108
- <filename>inspect_and_edit_parametric_schedules_test.rb</filename>
109
- <filetype>rb</filetype>
110
- <usage_type>test</usage_type>
111
- <checksum>83CA7DAD</checksum>
96
+ <filename>apply_measures_now.png</filename>
97
+ <filetype>png</filetype>
98
+ <usage_type>doc</usage_type>
99
+ <checksum>2D9A8051</checksum>
112
100
  </file>
113
101
  <file>
114
102
  <version>
115
103
  <software_program>OpenStudio</software_program>
116
104
  <identifier>3.1.0</identifier>
117
- <min_compatible>3.1.0</min_compatible>
105
+ <min_compatible>3.8.0</min_compatible>
118
106
  </version>
119
107
  <filename>measure.rb</filename>
120
108
  <filetype>rb</filetype>
121
109
  <usage_type>script</usage_type>
122
- <checksum>EFE84854</checksum>
110
+ <checksum>5164BF8C</checksum>
111
+ </file>
112
+ <file>
113
+ <filename>example_parametric_model.osm</filename>
114
+ <filetype>osm</filetype>
115
+ <usage_type>test</usage_type>
116
+ <checksum>A0C68C28</checksum>
117
+ </file>
118
+ <file>
119
+ <filename>inspect_and_edit_parametric_schedules_test.rb</filename>
120
+ <filetype>rb</filetype>
121
+ <usage_type>test</usage_type>
122
+ <checksum>5DFEDEDD</checksum>
123
123
  </file>
124
124
  </files>
125
125
  </measure>