NREL · joseph-robertson · Apr 2, 2024 · Mar 15, 2024 · Mar 15, 2024 · Mar 15, 2024
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -12,6 +12,7 @@ env:
   OPENSTUDIO_SHA: "d5269793f1"
   OPENSTUDIO_PLATFORM: "Ubuntu-20.04-x86_64"
   OPENSTUDIO_EXT: "deb"
+  OPENSTUDIO_URL: "https://github.com/NREL/OpenStudio/releases/download/v3.7.0"
 
 jobs:
   format-files:
@@ -144,7 +145,7 @@ jobs:
       - name: Download and Install OpenStudio
         run: |
           export OS_DEBFILE="OpenStudio-$OPENSTUDIO_VER+$OPENSTUDIO_SHA-$OPENSTUDIO_PLATFORM.$OPENSTUDIO_EXT"
-          wget -q https://github.com/NREL/OpenStudio/releases/download/v$OPENSTUDIO_VER/$OS_DEBFILE
+          wget -q $OPENSTUDIO_URL/$OS_DEBFILE
           sudo apt install -y ./$OS_DEBFILE
           openstudio openstudio_version
           which openstudio

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ Features
 - Refrigerator energy use is now affected by its ambient temperature using hourly constant and temperature coefficients from ANSI/RESNET/ICC 301-2022 Addendum C ([#1209](https://github.com/NREL/resstock/pull/1209))
 - Add Metropolitan and Micropolitan Statistical Area tsv, County Metro Status tsv, and State Metro Median Income tsv ([#1212](https://github.com/NREL/resstock/pull/1212))
 - Add ability to specify HVAC system autosizing factors for baseline buildings; autosizing factors are retained for upgrade buildings following the same approach for HVAC system capacities ([#1215](https://github.com/NREL/resstock/pull/1215))
+- Update the stochastic schedule generator to produce updated other/TV plug load and ceiling fan schedules ([#1220](https://github.com/NREL/resstock/pull/1220))
 
 Fixes
 - Remove old HPWH options from options_lookup ([#1190](https://github.com/NREL/resstock/pull/1190))

diff --git a/docs/read_the_docs/source/workflow_inputs/characteristics.rst b/docs/read_the_docs/source/workflow_inputs/characteristics.rst
@@ -8223,12 +8223,12 @@ Arguments
      - Double
      - "auto"
      - The setpoint temperature of water heater. If not provided, the OS-HPXML default (see `HPXML Water Heating Systems <https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-water-heating-systems>`_) is used.
-   * - ``water_heater_num_units_served``
-     - true
+   * - ``water_heater_num_bedrooms_served``
+     - false
      - #
      - Integer
      -
-     - Number of dwelling units served (directly or indirectly) by the water heater. Must be 1 if single-family detached. Used to apportion water heater tank losses to the unit.
+     - Number of bedrooms served (directly or indirectly) by the water heater. Only needed if single-family attached or apartment unit and it is a shared water heater serving multiple dwelling units. Used to apportion water heater tank losses to the unit.
    * - ``water_heater_uses_desuperheater``
      - false
      - 

diff --git a/measures/ResStockArguments/README.md b/measures/ResStockArguments/README.md
@@ -3035,16 +3035,14 @@ The setpoint temperature of water heater. If not provided, the OS-HPXML default
 
 <br/>
 
-**Water Heater: Number of Units Served**
+**Water Heater: Number of Bedrooms Served**
 
-Number of dwelling units served (directly or indirectly) by the water heater. Must be 1 if single-family detached. Used to apportion water heater tank losses to the unit.
+Number of bedrooms served (directly or indirectly) by the water heater. Only needed if single-family attached or apartment unit and it is a shared water heater serving multiple dwelling units. Used to apportion water heater tank losses to the unit.
 
-- **Name:** ``water_heater_num_units_served``
-- **Type:** ``Integer``
-
-- **Units:** ``#``
+- **Name:** ``water_heater_num_bedrooms_served``
+- **Type:** ``String``
 
-- **Required:** ``true``
+- **Required:** ``false``
 
 <br/>
 

diff --git a/measures/ResStockArguments/measure.xml b/measures/ResStockArguments/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>res_stock_arguments</name>
   <uid>c984bb9e-4ac4-4930-a399-9d23f8f6936a</uid>
-  <version_id>d21e9cb1-9960-4d43-a508-3c72268fec82</version_id>
-  <version_modified>2024-03-11T22:44:04Z</version_modified>
+  <version_id>3c9d7ca4-f17b-437d-be75-4e07f543004f</version_id>
+  <version_modified>2024-03-28T02:29:55Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>ResStockArguments</class_name>
   <display_name>ResStock Arguments</display_name>
@@ -4299,14 +4299,13 @@
       <model_dependent>false</model_dependent>
     </argument>
     <argument>
-      <name>water_heater_num_units_served</name>
-      <display_name>Water Heater: Number of Units Served</display_name>
-      <description>Number of dwelling units served (directly or indirectly) by the water heater. Must be 1 if single-family detached. Used to apportion water heater tank losses to the unit.</description>
-      <type>Integer</type>
+      <name>water_heater_num_bedrooms_served</name>
+      <display_name>Water Heater: Number of Bedrooms Served</display_name>
+      <description>Number of bedrooms served (directly or indirectly) by the water heater. Only needed if single-family attached or apartment unit and it is a shared water heater serving multiple dwelling units. Used to apportion water heater tank losses to the unit.</description>
+      <type>String</type>
       <units>#</units>
-      <required>true</required>
+      <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>1</default_value>
     </argument>
     <argument>
       <name>water_heater_uses_desuperheater</name>
@@ -7319,7 +7318,7 @@
       <filename>README.md</filename>
       <filetype>md</filetype>
       <usage_type>readme</usage_type>
-      <checksum>E180628E</checksum>
+      <checksum>5A50B89F</checksum>
     </file>
     <file>
       <filename>README.md.erb</filename>
@@ -7342,7 +7341,7 @@
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>48FA0665</checksum>
+      <checksum>86137592</checksum>
     </file>
     <file>
       <filename>resstock_arguments_test.rb</filename>

diff --git a/measures/ResStockArguments/resources/constants.rb b/measures/ResStockArguments/resources/constants.rb
@@ -88,6 +88,7 @@ def self.build_residential_schedule_file_excludes
             'schedules_random_seed',
             'output_csv_path',
             'hpxml_output_path',
+            'append_output',
             'debug',
             'building_id']
   end

diff --git a/measures/UpgradeCosts/measure.xml b/measures/UpgradeCosts/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>upgrade_costs</name>
   <uid>ef51212c-acc4-48d7-9b29-cf2a5c6c4449</uid>
-  <version_id>48f0f29c-0fcc-4d3a-b68d-9d05a2585b24</version_id>
-  <version_modified>2024-03-04T19:39:09Z</version_modified>
+  <version_id>0ab29aa4-a06b-44b1-bd61-1f6b3b8b988a</version_id>
+  <version_modified>2024-03-27T22:57:26Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>UpgradeCosts</class_name>
   <display_name>Upgrade Costs</display_name>
@@ -81,157 +81,157 @@
       <filename>MF_1story_UB_Furnace_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0DC1A40A</checksum>
+      <checksum>E25C10A6</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F8D22461</checksum>
+      <checksum>2F063A50</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>4973BAD4</checksum>
+      <checksum>00DC06A5</checksum>
     </file>
     <file>
       <filename>MF_2story_UB_Furnace_AC1_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2172BD41</checksum>
+      <checksum>D96319E6</checksum>
     </file>
     <file>
       <filename>SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>A28B6530</checksum>
+      <checksum>5BB5AEDD</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>8E98AE71</checksum>
+      <checksum>9B276DD7</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>305859C4</checksum>
+      <checksum>48E3E2F1</checksum>
     </file>
     <file>
       <filename>SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2AEA48AA</checksum>
+      <checksum>DE1353CB</checksum>
     </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>EA748F9A</checksum>
+      <checksum>A35D75CF</checksum>
     </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.xml</filename>
       <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>7973E32C</checksum>
+      <checksum>113AAA1C</checksum>
     </file>
     <file>
       <filename>SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0A63ED16</checksum>
+      <checksum>671B1CF5</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_ASHP2_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E7D36AAB</checksum>
+      <checksum>633C8822</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>2ADA0C8D</checksum>
+      <checksum>BC978C5D</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>01B84F1B</checksum>
+      <checksum>034E036E</checksum>
     </file>
     <file>
       <filename>SFD_1story_UB_UA_GRG_ACV_FuelFurnace_PortableHeater_HPWH.xml</filename>
       <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>543033F3</checksum>
+      <checksum>8F4DA9BD</checksum>
     </file>
     <file>
       <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>0512FD2F</checksum>
+      <checksum>3472996A</checksum>
     </file>
     <file>
       <filename>SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.xml</filename>
       <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>DAEEFD9D</checksum>
+      <checksum>DFE83CD6</checksum>
     </file>
     <file>
       <filename>SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>BFCAB8C8</checksum>
+      <checksum>47092F48</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>F1643CE0</checksum>
+      <checksum>00347BFF</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.xml</filename>
       <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>77407C53</checksum>
+      <checksum>1DF5A497</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>38ABCC82</checksum>
+      <checksum>B7ADB1FF</checksum>
     </file>
     <file>
       <filename>SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>676EC056</checksum>
+      <checksum>0740B85A</checksum>
     </file>
     <file>
       <filename>SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>E5B942BC</checksum>
+      <checksum>4368DD0F</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>9CBF47E7</checksum>
+      <checksum>20268BB9</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_Fireplace_FuelTanklessWH_ERV.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>C627B93B</checksum>
+      <checksum>51EB98B2</checksum>
     </file>
     <file>
       <filename>SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osw</filename>
       <filetype>osw</filetype>
       <usage_type>test</usage_type>
-      <checksum>ACAA5D8F</checksum>
+      <checksum>9494BFFE</checksum>
     </file>
     <file>
       <filename>in.epw</filename>
@@ -243,13 +243,13 @@
       <filename>in.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>C1115408</checksum>
+      <checksum>FB4DAD1C</checksum>
     </file>
     <file>
       <filename>in.xml</filename>
       <filetype>xml</filetype>
       <usage_type>test</usage_type>
-      <checksum>67D36320</checksum>
+      <checksum>5FE34373</checksum>
     </file>
     <file>
       <filename>upgrade_costs_test.rb</filename>

diff --git a/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_1story_UB_Furnace_AC1_FuelTankWH.osw
@@ -279,7 +279,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_ASHP2_HPWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "electricity",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw b/measures/UpgradeCosts/tests/MF_2story_UB_Furnace_AC1_FuelTankWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_ASHP2_HPWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "electricity",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,

diff --git a/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw b/measures/UpgradeCosts/tests/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osw
@@ -278,7 +278,6 @@
         "water_heater_fuel_type": "natural gas",
         "water_heater_jacket_rvalue": 0,
         "water_heater_location": "conditioned space",
-        "water_heater_num_units_served": 1,
         "water_heater_recovery_efficiency": 0.76,
         "water_heater_setpoint_temperature": 125,
         "water_heater_standby_loss": 0,