Merge pull request #1061 from NREL/latest-os-hpxml

Latest OS-HPXML
NREL · Mar 23, 2023 · ad50287 · ad50287
2 parents 62ea6e0 + ad21adc
commit ad50287
Show file tree

Hide file tree

Showing 24 changed files with 105,811 additions and 106,104 deletions.
diff --git a/measures/ServerDirectoryCleanup/measure.xml b/measures/ServerDirectoryCleanup/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>server_directory_cleanup</name>
   <uid>ec7d04ad-0b7b-495b-825a-e1b6d28d1d3f</uid>
-  <version_id>c2155142-929d-46c3-bca8-b648ae0d97ba</version_id>
-  <version_modified>20230322T231817Z</version_modified>
+  <version_id>edf0cd76-10f9-4c2e-a3a1-703920710a2b</version_id>
+  <version_modified>20230323T153743Z</version_modified>
   <xml_checksum>5F1EDF75</xml_checksum>
   <class_name>ServerDirectoryCleanup</class_name>
   <display_name>Server Directory Cleanup</display_name>

diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml b/resources/hpxml-measures/BuildResidentialScheduleFile/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>build_residential_schedule_file</name>
   <uid>f770b2db-1a9f-4e99-99a7-7f3161a594b1</uid>
-  <version_id>2e7e9dee-6b6d-423e-a2a2-082bb3c606dc</version_id>
-  <version_modified>20230110T190141Z</version_modified>
+  <version_id>02334346-9b05-4bf8-ac5c-0b5d459a1845</version_id>
+  <version_modified>20230321T185617Z</version_modified>
   <xml_checksum>03F02484</xml_checksum>
   <class_name>BuildResidentialScheduleFile</class_name>
   <display_name>Schedule File Builder</display_name>
@@ -22,7 +22,7 @@
     <argument>
       <name>schedules_column_names</name>
       <display_name>Schedules: Column Names</display_name>
-      <description>A comma-separated list of the column names to generate. If not provided, defaults to all columns. Possible column names are: occupants, lighting_interior, lighting_exterior, lighting_garage, lighting_exterior_holiday, cooking_range, dishwasher, clothes_washer, clothes_dryer, ceiling_fan, plug_loads_other, hot_water_dishwasher, hot_water_clothes_washer, hot_water_fixtures.</description>
+      <description>A comma-separated list of the column names to generate. If not provided, defaults to all columns. Possible column names are: occupants, lighting_interior, lighting_garage, cooking_range, dishwasher, clothes_washer, clothes_dryer, ceiling_fan, plug_loads_other, plug_loads_tv, hot_water_dishwasher, hot_water_clothes_washer, hot_water_fixtures.</description>
       <type>String</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -85,18 +85,6 @@
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>schedules_config.md</filename>
-      <filetype>md</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>EC6567F6</checksum>
-    </file>
-    <file>
-      <filename>schedules_config.json</filename>
-      <filetype>json</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>0CB5683C</checksum>
-    </file>
     <file>
       <filename>clothes_dryer_consumption_dist.csv</filename>
       <filetype>csv</filetype>
@@ -871,28 +859,40 @@
       <usage_type>resource</usage_type>
       <checksum>AAB89065</checksum>
     </file>
+    <file>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.2.0</identifier>
+        <min_compatible>3.2.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>94C38C85</checksum>
+    </file>
     <file>
       <filename>build_residential_schedule_file_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>580F9B46</checksum>
+      <checksum>4EB7959F</checksum>
     </file>
     <file>
-      <filename>schedules.rb</filename>
+      <filename>schedules_config.md</filename>
+      <filetype>md</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>916BF4C3</checksum>
+    </file>
+    <file>
+      <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>DAE98658</checksum>
+      <checksum>EED44A60</checksum>
     </file>
     <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.2.0</identifier>
-        <min_compatible>3.2.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
+      <filename>schedules.rb</filename>
       <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>94C38C85</checksum>
+      <usage_type>resource</usage_type>
+      <checksum>51D9D15E</checksum>
     </file>
   </files>
 </measure>
diff --git a/resources/hpxml-measures/BuildResidentialScheduleFile/resources/constants.rb b/resources/hpxml-measures/BuildResidentialScheduleFile/resources/constants.rb
@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+class Constants
+  def self.OccupancyTypesProbabilities
+    return '0.381, 0.297, 0.165, 0.157'
+  end
+
+  def self.CeilingFanWeekdayFractions
+    return '0.04, 0.037, 0.037, 0.036, 0.033, 0.036, 0.043, 0.047, 0.034, 0.023, 0.024, 0.025, 0.024, 0.028, 0.031, 0.032, 0.039, 0.053, 0.063, 0.067, 0.071, 0.069, 0.059, 0.05'
+  end
+
+  def self.CeilingFanWeekendFractions
+    return '0.04, 0.037, 0.037, 0.036, 0.033, 0.036, 0.043, 0.047, 0.034, 0.023, 0.024, 0.025, 0.024, 0.028, 0.031, 0.032, 0.039, 0.053, 0.063, 0.067, 0.071, 0.069, 0.059, 0.05'
+  end
+
+  def self.SinkDurationProbability
+    return '0.901242, 0.076572, 0.01722, 0.003798, 0.000944, 0.000154, 4.6e-05, 2.2e-05, 2.0e-06'
+  end
+
+  def self.SinkEventsPerClusterProbs
+    return '0.62458, 0.18693, 0.08011, 0.0433, 0.02178, 0.01504, 0.0083, 0.00467, 0.0057, 0.00285, 0.00181, 0.00233, 0.0013, 0.00104, 0.00026'
+  end
+
+  def self.SinkHourlyOnsetProb
+    return '0.007, 0.018, 0.042, 0.062, 0.066, 0.062, 0.054, 0.05, 0.049, 0.045, 0.041, 0.043, 0.048, 0.065, 0.075, 0.069, 0.057, 0.048, 0.04, 0.027, 0.014, 0.007, 0.005, 0.005'
+  end
+
+  def self.SinkAvgSinkClustersPerHH
+    return 6657
+  end
+
+  def self.SinkMinutesBetweenEventGap
+    return 2
+  end
+
+  def self.SinkFlowRateMean
+    return 1.14
+  end
+
+  def self.SinkFlowRateStd
+    return 0.61
+  end
+
+  def self.ShowerMinutesBetweenEventGap
+    return 30
+  end
+
+  def self.ShowerFlowRateMean
+    return 2.25
+  end
+
+  def self.ShowerFlowRateStd
+    return 0.68
+  end
+
+  def self.BathBathToShowerRatio
+    return 0.078843
+  end
+
+  def self.BathDurationMean
+    return 5.65
+  end
+
+  def self.BathDurationStd
+    return 2.09
+  end
+
+  def self.BathFlowRateMean
+    return 4.4
+  end
+
+  def self.BathFlowRateStd
+    return 1.17
+  end
+
+  def self.HotWaterDishwasherFlowRateMean
+    return 1.39
+  end
+
+  def self.HotWaterDishwasherFlowRateStd
+    return 0.2
+  end
+
+  def self.HotWaterDishwasherMinutesBetweenEventGap
+    return 10
+  end
+
+  def self.HotWaterDishwasherMonthlyMultiplier
+    return '1.083, 1.056, 1.023, 0.999, 0.975, 0.944, 0.918, 0.928, 0.938, 0.984, 1.059, 1.094'
+  end
+
+  def self.HotWaterClothesWasherFlowRateMean
+    return 2.2
+  end
+
+  def self.HotWaterClothesWasherFlowRateStd
+    return 0.62
+  end
+
+  def self.HotWaterClothesWasherMinutesBetweenEventGap
+    return 4
+  end
+
+  def self.HotWaterClothesWasherLoadSizeProbability
+    return '0.682926829, 0.227642276, 0.056910569, 0.032520325'
+  end
+
+  def self.HotWaterClothesWasherMonthlyMultiplier
+    return '0.968, 1.013, 0.99, 1.034, 1.019, 1.015, 1.048, 1, 1.021, 0.949, 0.945, 0.999'
+  end
+
+  def self.ClothesDryerMonthlyMultiplier
+    return '1.09, 1.054, 1.044, 0.996, 0.992, 0.967, 0.931, 0.906, 0.923, 0.955, 1.035, 1.108'
+  end
+
+  def self.CookingMonthlyMultiplier
+    return '1.038, 1.026, 0.976, 0.945, 0.965, 0.947, 0.939, 0.965, 0.967, 1.006, 1.098, 1.129'
+  end
+end