diff --git a/BuildResidentialScheduleFile/README.md b/BuildResidentialScheduleFile/README.md
index 30c3d1c28c..3223291151 100644
--- a/BuildResidentialScheduleFile/README.md
+++ b/BuildResidentialScheduleFile/README.md
@@ -24,7 +24,7 @@ Absolute/relative path of the HPXML file.
**Schedules: Column Names**
-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, electric_vehicle.
+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, hot_water_showers, hot_water_showers_minutes, electric_vehicle.
- **Name:** ``schedules_column_names``
- **Type:** ``String``
diff --git a/BuildResidentialScheduleFile/measure.rb b/BuildResidentialScheduleFile/measure.rb
index 4d92e1b10a..3fe45652fd 100644
--- a/BuildResidentialScheduleFile/measure.rb
+++ b/BuildResidentialScheduleFile/measure.rb
@@ -362,6 +362,8 @@ def update_hpxml_building(hpxml_bldg, args)
vehicle.ev_weekend_fractions = nil
vehicle.ev_monthly_multipliers = nil
end
+ when SchedulesFile::Columns[:HotWaterShowers].name
+ when SchedulesFile::Columns[:HotWaterShowersMinutes].name
else
fail "Unexpected column name: #{column_name}"
end
diff --git a/BuildResidentialScheduleFile/measure.xml b/BuildResidentialScheduleFile/measure.xml
index daef43079b..6afe917777 100644
--- a/BuildResidentialScheduleFile/measure.xml
+++ b/BuildResidentialScheduleFile/measure.xml
@@ -3,8 +3,8 @@
3.1
build_residential_schedule_file
f770b2db-1a9f-4e99-99a7-7f3161a594b1
- d9297fcd-5d59-4716-b586-a8eb5a4de124
- 2025-05-13T19:26:09Z
+ 56772f7a-6161-4904-9d76-be8b37db90b5
+ 2025-06-06T17:33:04Z
03F02484
BuildResidentialScheduleFile
Schedule File Builder
@@ -22,7 +22,7 @@
schedules_column_names
Schedules: Column Names
- 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, electric_vehicle.
+ 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, hot_water_showers, hot_water_showers_minutes, electric_vehicle.
String
false
false
@@ -116,7 +116,7 @@
README.md
md
readme
- 04BFD8B8
+ B01B00BE
README.md.erb
@@ -133,7 +133,7 @@
measure.rb
rb
script
- 93AE5D02
+ 5631097B
README.md
@@ -229,7 +229,7 @@
schedules.rb
rb
resource
- 7402E4B2
+ A0823D86
shower_cluster_size_probability.csv
@@ -427,7 +427,7 @@
test_build_residential_schedule_file.rb
rb
test
- DC417F90
+ 21CB774E
diff --git a/BuildResidentialScheduleFile/resources/schedules.rb b/BuildResidentialScheduleFile/resources/schedules.rb
index 91601f0822..93954eb5b0 100644
--- a/BuildResidentialScheduleFile/resources/schedules.rb
+++ b/BuildResidentialScheduleFile/resources/schedules.rb
@@ -154,7 +154,7 @@ def create_stochastic_schedules(args:,
# Apply random shift to occupancy schedules
home_schedule = occupancy_schedules[:away_schedule].map { |i| (1.0 - i) }
- @schedules[SchedulesFile::Columns[:Occupants].name] = random_shift_and_normalize(home_schedule, @minutes_per_step)
+ @schedules[SchedulesFile::Columns[:Occupants].name], _ = random_shift_and_normalize(home_schedule, @minutes_per_step)
fill_plug_loads_schedule(weather, occupancy_schedules)
fill_lighting_schedule(args, occupancy_schedules)
@@ -166,37 +166,39 @@ def create_stochastic_schedules(args:,
if !@hpxml_bldg.dishwashers.to_a.empty?
dw_hot_water_sch = generate_dishwasher_schedule(mkc_activity_schedules)
dw_power_sch = generate_dishwasher_power_schedule(mkc_activity_schedules)
- @schedules[SchedulesFile::Columns[:HotWaterDishwasher].name] = random_shift_and_normalize(dw_hot_water_sch)
- @schedules[SchedulesFile::Columns[:Dishwasher].name] = random_shift_and_normalize(dw_power_sch)
+ @schedules[SchedulesFile::Columns[:HotWaterDishwasher].name], _ = random_shift_and_normalize(dw_hot_water_sch)
+ @schedules[SchedulesFile::Columns[:Dishwasher].name], _ = random_shift_and_normalize(dw_power_sch)
end
if !@hpxml_bldg.clothes_washers.to_a.empty?
cw_hot_water_sch = generate_clothes_washer_schedule(mkc_activity_schedules)
cw_power_sch, cd_power_sch = generate_clothes_washer_dryer_power_schedules(mkc_activity_schedules)
- @schedules[SchedulesFile::Columns[:HotWaterClothesWasher].name] = random_shift_and_normalize(cw_hot_water_sch)
- @schedules[SchedulesFile::Columns[:ClothesWasher].name] = random_shift_and_normalize(cw_power_sch)
+ @schedules[SchedulesFile::Columns[:HotWaterClothesWasher].name], _ = random_shift_and_normalize(cw_hot_water_sch)
+ @schedules[SchedulesFile::Columns[:ClothesWasher].name], _ = random_shift_and_normalize(cw_power_sch)
if !@hpxml_bldg.clothes_dryers.to_a.empty?
- @schedules[SchedulesFile::Columns[:ClothesDryer].name] = random_shift_and_normalize(cd_power_sch)
+ @schedules[SchedulesFile::Columns[:ClothesDryer].name], _ = random_shift_and_normalize(cd_power_sch)
end
end
if !@hpxml_bldg.cooking_ranges.to_a.empty?
cooking_power_sch = generate_cooking_power_schedule(mkc_activity_schedules)
- @schedules[SchedulesFile::Columns[:CookingRange].name] = random_shift_and_normalize(cooking_power_sch)
+ @schedules[SchedulesFile::Columns[:CookingRange].name], _ = random_shift_and_normalize(cooking_power_sch)
end
- showers = random_shift_and_normalize(shower_activity_sch)
- sinks = random_shift_and_normalize(sink_activity_sch)
- baths = random_shift_and_normalize(bath_activity_sch)
+ showers, shower_minutes = random_shift_and_normalize(shower_activity_sch)
+ @schedules[SchedulesFile::Columns[:HotWaterShowers].name] = showers
+ @schedules[SchedulesFile::Columns[:HotWaterShowersMinutes].name] = shower_minutes
+ sinks, _ = random_shift_and_normalize(sink_activity_sch)
+ baths, _ = random_shift_and_normalize(bath_activity_sch)
fixtures = [showers, sinks, baths].transpose.map(&:sum)
@schedules[SchedulesFile::Columns[:HotWaterFixtures].name] = normalize(fixtures)
# Apply random shift to EV occupant presence but don't normalize
- ev_occupant_presence = random_shift_and_normalize(occupancy_schedules[:ev_occupant_presence], @minutes_per_step)
+ ev_occupant_presence, _ = random_shift_and_normalize(occupancy_schedules[:ev_occupant_presence], @minutes_per_step)
fill_ev_schedules(mkc_activity_schedules, ev_occupant_presence)
if @debug
- @schedules[SchedulesFile::Columns[:Sleeping].name] = random_shift_and_normalize(occupancy_schedules[:sleep_schedule], @minutes_per_step)
+ @schedules[SchedulesFile::Columns[:Sleeping].name], _ = random_shift_and_normalize(occupancy_schedules[:sleep_schedule], @minutes_per_step)
end
return true
end
@@ -870,8 +872,8 @@ def fill_ev_schedules(markov_chain_simulation_result, ev_occupant_presence)
away_index = 5 # Index of away activity in the markov-chain simulator
away_schedule = markov_chain_simulation_result[@ev_occupant_number].column(away_index)
charging_schedule, discharging_schedule = get_ev_battery_schedule(away_schedule, hours_per_year)
- agg_charging_schedule = random_shift_and_normalize(charging_schedule, @minutes_per_step)
- agg_discharging_schedule = random_shift_and_normalize(discharging_schedule, @minutes_per_step)
+ agg_charging_schedule, _ = random_shift_and_normalize(charging_schedule, @minutes_per_step)
+ agg_discharging_schedule, _ = random_shift_and_normalize(discharging_schedule, @minutes_per_step)
# The combined schedule is not a sum of the charging and discharging schedules because when charging and discharging
# both occur in a timestep, we don't want them to cancel out and draw no power from the building. So, whenever there
@@ -992,16 +994,16 @@ def fill_plug_loads_schedule(weather, occupancy_schedules)
# Generate schedules for each plug load type if it exists
if @hpxml_bldg.plug_loads.find { |p| p.plug_load_type == 'other' }
plug_loads_other = generate_plug_load_schedule(daily_schedules, :plug_loads_other, occupancy_schedules)
- @schedules[SchedulesFile::Columns[:PlugLoadsOther].name] = random_shift_and_normalize(plug_loads_other)
+ @schedules[SchedulesFile::Columns[:PlugLoadsOther].name], _ = random_shift_and_normalize(plug_loads_other)
end
if @hpxml_bldg.plug_loads.find { |p| p.plug_load_type == 'TV other' }
plug_loads_tv = generate_plug_load_schedule(daily_schedules, :plug_loads_tv, occupancy_schedules)
- @schedules[SchedulesFile::Columns[:PlugLoadsTV].name] = random_shift_and_normalize(plug_loads_tv)
+ @schedules[SchedulesFile::Columns[:PlugLoadsTV].name], _ = random_shift_and_normalize(plug_loads_tv)
end
if !@hpxml_bldg.ceiling_fans.to_a.empty?
ceiling_fan = generate_plug_load_schedule(daily_schedules, :ceiling_fan, occupancy_schedules)
- @schedules[SchedulesFile::Columns[:CeilingFan].name] = random_shift_and_normalize(ceiling_fan)
+ @schedules[SchedulesFile::Columns[:CeilingFan].name], _ = random_shift_and_normalize(ceiling_fan)
end
end
@@ -1063,7 +1065,7 @@ def fill_lighting_schedule(args, occupancy_schedules)
end
end
- normalized_lighting = random_shift_and_normalize(lighting_interior)
+ normalized_lighting, _ = random_shift_and_normalize(lighting_interior)
@schedules[SchedulesFile::Columns[:LightingInterior].name] = normalized_lighting
if @hpxml_bldg.has_location(HPXML::LocationGarage)
@schedules[SchedulesFile::Columns[:LightingGarage].name] = normalized_lighting
@@ -1477,7 +1479,7 @@ def generate_cooking_power_schedule(mkc_activity_schedules)
# Apply random time shift to schedule values without normalizing.
#
# @param schedule [Array] Array of minute-level schedule values
- # @return [Array] Schedule with random time shift applied
+ # @return [Array, Array] Schedule with random time shift applied, schedule of minutes
def random_shift_and_aggregate(schedule)
schedule.rotate!(@random_offset)
@@ -1485,18 +1487,33 @@ def random_shift_and_aggregate(schedule)
schedule = apply_monthly_offsets(array: schedule,
weekday_monthly_shift_dict: @weekday_monthly_shift_dict,
weekend_monthly_shift_dict: @weekend_monthly_shift_dict)
+ schedule_minutes = count_nonzero(schedule, @minutes_per_step)
schedule = aggregate_array(schedule, @minutes_per_step)
- return schedule
+ return schedule, schedule_minutes
end
# Apply random time shift and normalize schedule values.
#
# @param schedule [Array] Array of minute-level schedule values
# @param max_val [Float] Maximum value to normalize to. If nil, use the maximum value in the schedule.
- # @return [Array] Normalized schedule with random time shift applied
+ # @return [Array, Array] Normalized schedule with random time shift applied, schedule of minutes
def random_shift_and_normalize(schedule, max_val = nil)
- shifted_schedule = random_shift_and_aggregate(schedule)
- return normalize(shifted_schedule, max_val)
+ shifted_schedule, schedule_minutes = random_shift_and_aggregate(schedule)
+ return normalize(shifted_schedule, max_val), schedule_minutes
+ end
+
+ # Counts the number of non-zero values in each group of size group_size in the input array
+ #
+ # @param array [Array] The input array to process
+ # @param group_size [Integer] The size of each group to count non-zero values in
+ # @return [Array] Array containing counts of non-zero values for each group
+ def count_nonzero(array, group_size)
+ new_array_size = array.size / group_size
+ new_array = [0] * new_array_size
+ new_array_size.times do |j|
+ new_array[j] = array[(j * group_size)..(j + 1) * group_size - 1].count { |x| x != 0 }
+ end
+ return new_array
end
end
diff --git a/BuildResidentialScheduleFile/tests/test_build_residential_schedule_file.rb b/BuildResidentialScheduleFile/tests/test_build_residential_schedule_file.rb
index 3c047d3417..728760b160 100644
--- a/BuildResidentialScheduleFile/tests/test_build_residential_schedule_file.rb
+++ b/BuildResidentialScheduleFile/tests/test_build_residential_schedule_file.rb
@@ -59,6 +59,8 @@ def test_stochastic
HotWaterDishwasher: 287.3,
HotWaterClothesWasher: 322.6,
HotWaterFixtures: 1090.49,
+ HotWaterShowers: 576.9,
+ HotWaterShowersMinutes: 21529.0,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
assert(!sf.schedules.keys.include?(SchedulesFile::Columns[:Sleeping].name))
@@ -138,6 +140,8 @@ def test_stochastic_location_detailed
HotWaterDishwasher: 287.3,
HotWaterClothesWasher: 322.6,
HotWaterFixtures: 1090.49,
+ HotWaterShowers: 576.9,
+ HotWaterShowersMinutes: 21529.0,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
assert(!sf.schedules.keys.include?(SchedulesFile::Columns[:Sleeping].name))
@@ -176,6 +180,8 @@ def test_stochastic_debug
HotWaterDishwasher: 287.3,
HotWaterClothesWasher: 322.6,
HotWaterFixtures: 1090.49,
+ HotWaterShowers: 576.9,
+ HotWaterShowersMinutes: 21529.0,
Sleeping: 3101.7,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
@@ -213,6 +219,8 @@ def test_random_seed
HotWaterDishwasher: 304,
HotWaterClothesWasher: 322,
HotWaterFixtures: 1146.15,
+ HotWaterShowers: 576.9,
+ HotWaterShowersMinutes: 21529.0,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
@@ -236,6 +244,7 @@ def test_random_seed
sf = SchedulesFile.new(schedules_paths: hpxml.buildings[0].header.schedules_filepaths,
year: @year,
output_path: @tmp_schedule_file_path)
+
expected_values = {
Occupants: 6072,
LightingInterior: 1767.5,
@@ -248,6 +257,8 @@ def test_random_seed
HotWaterDishwasher: 243,
HotWaterClothesWasher: 263,
HotWaterFixtures: 966.11,
+ HotWaterShowers: 655.2,
+ HotWaterShowersMinutes: 22052,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
end
@@ -284,6 +295,8 @@ def test_10_min_timestep
HotWaterDishwasher: 155.9,
HotWaterClothesWasher: 138.4,
HotWaterFixtures: 345.7,
+ HotWaterShowers: 147.4,
+ HotWaterShowersMinutes: 3588.2,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
assert(!sf.schedules.keys.include?(SchedulesFile::Columns[:Sleeping].name))
@@ -381,6 +394,8 @@ def test_multiple_buildings
HotWaterDishwasher: 287.3,
HotWaterClothesWasher: 322.6,
HotWaterFixtures: 1090.49,
+ HotWaterShowers: 576.9,
+ HotWaterShowersMinutes: 21529,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
elsif hpxml_bldg.building_id == 'MyBuilding_2'
@@ -397,6 +412,8 @@ def test_multiple_buildings
HotWaterDishwasher: 229.8,
HotWaterClothesWasher: 246.5,
HotWaterFixtures: 948.79,
+ HotWaterShowers: 623.0,
+ HotWaterShowersMinutes: 22052,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
elsif hpxml_bldg.building_id == 'MyBuilding_3'
@@ -413,6 +430,8 @@ def test_multiple_buildings
HotWaterDishwasher: 232.1,
HotWaterClothesWasher: 206.8,
HotWaterFixtures: 955.2,
+ HotWaterShowers: 386.3,
+ HotWaterShowersMinutes: 21048,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
end
@@ -463,6 +482,8 @@ def test_multiple_buildings_id
HotWaterDishwasher: 229.8,
HotWaterClothesWasher: 246.5,
HotWaterFixtures: 948.79,
+ HotWaterShowers: 623.0,
+ HotWaterShowersMinutes: 22052,
}
assert_full_load_hrs_match(sf, expected_values, @tol)
assert(!sf.schedules.keys.include?(SchedulesFile::Columns[:Sleeping].name))
diff --git a/Changelog.md b/Changelog.md
index a97f8a3d8a..3cc4937d34 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ __New Features__
- Adds new outputs for *net* peak electricity (summer/winter/annual); same as *total* peak electricity outputs but subtracts power produced by PV.
- Avoids writing the E+ eplustbl.htm by default; use the debug flag to get it.
- Deletes eplusout\*.msgpack files by default (run_simulation.rb only); use the debug flag to preserve them.
+ - Adds "Unmet Hours: Showers (hr)" and "Unmet Hours: Showers (%)" to characterize unmet water heating loads.
- Allows arbitrary columns to be present in a detailed schedule csv file with warning.
__Bugfixes__
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 349bed80e5..2e06bb5eaf 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.1
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- 30615e87-95e5-4a66-a873-54b43e1b2ba8
- 2025-06-05T21:59:35Z
+ 9b33fca2-2375-4e13-85f9-48e4d06621c1
+ 2025-06-06T21:24:14Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -216,7 +216,7 @@
constants.rb
rb
resource
- 1382D07B
+ 6F6AC830
constructions.rb
@@ -282,7 +282,7 @@
data/default_schedules.csv
csv
resource
- B5344F37
+ 947A6C44
data/g_functions/C_configurations_5m_v1.0.json
@@ -336,7 +336,7 @@
data/unavailable_periods.csv
csv
resource
- 2DE72980
+ 9455C631
data/zipcode_weather_stations.csv
@@ -378,7 +378,7 @@
hotwater_appliances.rb
rb
resource
- C3937CAA
+ 3EB0221B
hpxml.rb
@@ -480,7 +480,7 @@
output.rb
rb
resource
- 067582CC
+ 3E1FE053
psychrometrics.rb
@@ -513,7 +513,7 @@
B93B3701
- schedule_files/occupancy-non-stochastic.csv
+ schedule_files/non-stochastic-occupants.csv
csv
resource
FA81E518
@@ -522,61 +522,73 @@
schedule_files/occupancy-stochastic-10-mins.csv
csv
resource
- 55BEFF64
+ BA7753F7
schedule_files/occupancy-stochastic-30-mins.csv
csv
resource
- 55BEFF64
+ BA7753F7
schedule_files/occupancy-stochastic-ev-charger.csv
csv
resource
- FEDC5979
+ F0A9396C
schedule_files/occupancy-stochastic-mf-unit.csv
csv
resource
- F464930F
+ 212A1CCB
schedule_files/occupancy-stochastic-mf-unit_2.csv
csv
resource
- C504DB69
+ C16E077B
schedule_files/occupancy-stochastic-mf-unit_3.csv
csv
resource
- BBE33CAE
+ 93E3F1C4
schedule_files/occupancy-stochastic-mf-unit_4.csv
csv
resource
- 1975BB7D
+ 4D37DC32
schedule_files/occupancy-stochastic-mf-unit_5.csv
csv
resource
- AFC15AEC
+ 48B1EE4C
schedule_files/occupancy-stochastic-mf-unit_6.csv
csv
resource
- 5563187E
+ C0D2B474
+
+
+ schedule_files/occupancy-stochastic-residents-1.csv
+ csv
+ resource
+ 0A39C82D
+
+
+ schedule_files/occupancy-stochastic-residents-5-5.csv
+ csv
+ resource
+ DA5334BC
schedule_files/occupancy-stochastic.csv
csv
resource
- 375096F7
+ 1B1E4678
schedule_files/print_diff.py
@@ -654,7 +666,7 @@
schedules.rb
rb
resource
- A53AFCEB
+ 79EF2597
simcontrols.rb
@@ -696,7 +708,7 @@
waterheater.rb
rb
resource
- C4F11745
+ 958F6A70
weather.rb
@@ -798,7 +810,7 @@
test_schedules.rb
rb
test
- 83E5B4A3
+ 6E242CD3
test_simcontrols.rb
@@ -810,7 +822,7 @@
test_validation.rb
rb
test
- 0B0A1E63
+ C83A5ED2
test_vehicle.rb
diff --git a/HPXMLtoOpenStudio/resources/constants.rb b/HPXMLtoOpenStudio/resources/constants.rb
index e2dc9d5be1..fe8e103146 100644
--- a/HPXMLtoOpenStudio/resources/constants.rb
+++ b/HPXMLtoOpenStudio/resources/constants.rb
@@ -77,11 +77,15 @@ module Constants
ObjectTypeRefrigerator = 'fridge'
ObjectTypeRoomAC = 'room ac'
ObjectTypeRoomHP = 'room ac with reverse cycle'
+ ObjectTypeShowers = 'hot_water_showers_minutes'
ObjectTypeSolarHotWater = 'solar hot water'
ObjectTypeTotalAirflowsProgram = 'total airflows program'
ObjectTypeTotalLoadsProgram = 'total loads program'
ObjectTypeUnitHeater = 'unit heater'
ObjectTypeUnmetHoursProgram = 'unmet hours program'
+ ObjectTypeUnmetShowersProgram = 'unmet showers program'
+ ObjectTypeUnmetLoadsShowerUnmetTime = 'unmet loads shower unmet time'
+ ObjectTypeUnmetLoadsShowerTime = 'unmet loads shower time'
ObjectTypeVehicle = 'vehicle'
ObjectTypeWaterHeater = 'water heater'
ObjectTypeWaterHeaterSetpoint = 'water heater setpoint'
@@ -253,6 +257,7 @@ module CLT
module UHT
Heating = 'Heating'
Cooling = 'Cooling'
+ HotWaterShower = 'Showers'
Driving = 'EV Driving'
end
diff --git a/HPXMLtoOpenStudio/resources/data/default_schedules.csv b/HPXMLtoOpenStudio/resources/data/default_schedules.csv
index 8073ac2852..83a164349c 100644
--- a/HPXMLtoOpenStudio/resources/data/default_schedules.csv
+++ b/HPXMLtoOpenStudio/resources/data/default_schedules.csv
@@ -89,3 +89,6 @@ hot_water_recirculation_pump,RecirculationPumpMonthlyScheduleMultipliers,"1.0, 1
electric_vehicle,WeekdayScheduleFractions,"0.0714, 0.0714, 0.0714, 0.0714, 0.0714, 0.0714, 0.0714, -0.3535, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, -0.3221, -0.3244, 0.0714, 0.0714, 0.0714, 0.0714, 0.0714, 0.0714, 0.0714",
electric_vehicle,WeekendScheduleFractions,"0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, -0.3334, 0, 0, 0, 0, -0.3293, -0.3372, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588, 0.0588",
electric_vehicle,MonthlyScheduleMultipliers,"1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0",
+hot_water_showers,ShowersWeekdayScheduleFractions,"0.011, 0.005, 0.003, 0.005, 0.014, 0.052, 0.118, 0.117, 0.095, 0.074, 0.06, 0.047, 0.034, 0.029, 0.026, 0.025, 0.03, 0.039, 0.042, 0.042, 0.042, 0.041, 0.029, 0.021",Figure 9 of the `2010 BAHSP `_
+hot_water_showers,ShowersWeekendScheduleFractions,"0.011, 0.005, 0.003, 0.005, 0.014, 0.052, 0.118, 0.117, 0.095, 0.074, 0.06, 0.047, 0.034, 0.029, 0.026, 0.025, 0.03, 0.039, 0.042, 0.042, 0.042, 0.041, 0.029, 0.021",Figure 9 of the `2010 BAHSP `_
+hot_water_showers,ShowersMonthlyScheduleMultipliers,"1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0",
diff --git a/HPXMLtoOpenStudio/resources/data/unavailable_periods.csv b/HPXMLtoOpenStudio/resources/data/unavailable_periods.csv
index 4563cb1d77..6b13bd74ac 100644
--- a/HPXMLtoOpenStudio/resources/data/unavailable_periods.csv
+++ b/HPXMLtoOpenStudio/resources/data/unavailable_periods.csv
@@ -24,6 +24,8 @@ pool_heater,0,1,0,0
permanent_spa_pump,0,1,0,0
permanent_spa_heater,0,1,0,0
hot_water_fixtures,1,1,0,0
+hot_water_showers,1,1,0,0
+hot_water_showers_minutes,1,1,0,0
hot_water_recirculation_pump,1,1,0,0
general_water_use,1,0,0,0
space_heating,0,1,1,0
diff --git a/HPXMLtoOpenStudio/resources/hotwater_appliances.rb b/HPXMLtoOpenStudio/resources/hotwater_appliances.rb
index 069f1480a1..11f61b98cd 100644
--- a/HPXMLtoOpenStudio/resources/hotwater_appliances.rb
+++ b/HPXMLtoOpenStudio/resources/hotwater_appliances.rb
@@ -14,6 +14,8 @@ module HotWaterAndAppliances
# @param plantloop_map [Hash] Map of HPXML System ID => OpenStudio PlantLoop objects
# @return [nil]
def self.apply(runner, model, weather, spaces, hpxml_bldg, hpxml_header, schedules_file, plantloop_map)
+ @default_schedules_csv_data = Defaults.get_schedules_csv_data()
+
# Get appliances, etc.
if not hpxml_bldg.clothes_washers.empty?
clothes_washer = hpxml_bldg.clothes_washers[0]
@@ -375,6 +377,26 @@ def self.apply(runner, model, weather, spaces, hpxml_bldg, hpxml_header, schedul
runner.registerWarning("Both '#{fixtures_col_name}' schedule file and weekend fractions provided; the latter will be ignored.") if !water_heating.water_fixtures_weekend_fractions.nil?
runner.registerWarning("Both '#{fixtures_col_name}' schedule file and monthly multipliers provided; the latter will be ignored.") if !water_heating.water_fixtures_monthly_multipliers.nil?
end
+
+ # Create a separate shower schedule (from fixtures) used only for unmet showers calculation
+ showers_schedule = nil
+ showers_col_name = SchedulesFile::Column:HotWaterShowersMinutes].name
+ showers_obj_name = Constants::ObjectTypeShowers
+ if not schedules_file.nil?
+ showers_schedule = schedules_file.create_schedule_file(model, col_name: showers_col_name)
+ showers_schedule_name = showers_col_name
+ end
+ if showers_schedule.nil?
+ showers_unavailable_periods = Schedule.get_unavailable_periods(runner, showers_col_name, hpxml_header.unavailable_periods)
+ showers_weekday_sch = @default_schedules_csv_data[showers_col_name]['ShowersWeekdayScheduleFractions']
+ showers_weekend_sch = @default_schedules_csv_data[showers_col_name]['ShowersWeekendScheduleFractions']
+ showers_monthly_sch = @default_schedules_csv_data[showers_col_name]['ShowersMonthlyScheduleMultipliers']
+ showers_schedule_obj = MonthWeekdayWeekendSchedule.new(model, showers_obj_name + ' schedule', showers_weekday_sch, showers_weekend_sch, showers_monthly_sch, EPlus::ScheduleTypeLimitsFraction, unavailable_periods: showers_unavailable_periods)
+ showers_schedule_name = showers_schedule_obj.schedule.name
+ end
+
+ # Add unmet showers calculation
+ Waterheater.unmet_showers_program(model, hpxml_bldg.water_heating_systems, plantloop_map, mw_temp_schedule, showers_schedule_name)
end
hpxml_bldg.water_heating_systems.each do |water_heating_system|
diff --git a/HPXMLtoOpenStudio/resources/output.rb b/HPXMLtoOpenStudio/resources/output.rb
index 827744ca3b..66ddd9c610 100644
--- a/HPXMLtoOpenStudio/resources/output.rb
+++ b/HPXMLtoOpenStudio/resources/output.rb
@@ -17,12 +17,13 @@ module Outputs
# @param add_component_loads [Boolean] Whether to calculate component loads (since it incurs a runtime speed penalty)
# @return [nil]
def self.apply_ems_programs(model, hpxml_osm_map, hpxml_header, add_component_loads)
- season_day_nums = Outputs.apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
- loads_data = Outputs.apply_total_loads_ems_program(model, hpxml_osm_map, hpxml_header)
+ season_day_nums = apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
+ add_unmet_showers_ems_program(model, hpxml_osm_map)
+ loads_data = apply_total_loads_ems_program(model, hpxml_osm_map, hpxml_header)
if add_component_loads
- Outputs.apply_component_loads_ems_program(model, hpxml_osm_map, loads_data, season_day_nums)
+ apply_component_loads_ems_program(model, hpxml_osm_map, loads_data, season_day_nums)
end
- Outputs.apply_total_airflows_ems_program(model, hpxml_osm_map)
+ apply_total_airflows_ems_program(model, hpxml_osm_map)
end
# Creates an EMS program that calculates heating and cooling unmet hours (number
@@ -172,6 +173,57 @@ def self.apply_unmet_hours_ems_program(model, hpxml_osm_map, hpxml_header)
return season_day_nums
end
+ # Creates unmet showers outputs that use max hourly value across all individual dwelling
+ # units for output reporting.
+ #
+ # @param model [OpenStudio::Model::Model] OpenStudio Model object
+ # @param hpxml_osm_map [Hash] Map of HPXML::Building objects => OpenStudio Model objects for each dwelling unit
+ # @return [void]
+ def self.add_unmet_showers_ems_program(model, hpxml_osm_map)
+ return if hpxml_osm_map.select { |hpxml_bldg, _unit_model| !hpxml_bldg.water_heating_systems.empty? }.empty?
+
+ # Retrieve objects
+ shower_unmet_time_vars = []
+ shower_time_vars = []
+ hpxml_osm_map.each do |_hpxml_bldg, unit_model|
+ shower_unmet_time_vars << unit_model.getEnergyManagementSystemGlobalVariables.find { |v| v.additionalProperties.getFeatureAsString('ObjectType').to_s == Constants::ObjectTypeUnmetLoadsShowerUnmetTime }
+ shower_time_vars << unit_model.getEnergyManagementSystemGlobalVariables.find { |v| v.additionalProperties.getFeatureAsString('ObjectType').to_s == Constants::ObjectTypeUnmetLoadsShowerTime }
+ end
+
+ # EMS program
+ total_shower_unmet_time = 'total_shower_unmet_time'
+ total_shower_time = 'total_shower_time'
+ unit_shower_unmet_time = 'unit_shower_unmet_time'
+ unit_shower_time = 'unit_shower_time'
+ program = Model.add_ems_program(
+ model,
+ name: 'unmet showers program'
+ )
+ program.additionalProperties.setFeature('ObjectType', Constants::ObjectTypeUnmetShowersProgram)
+ program.addLine("Set #{total_shower_unmet_time} = 0")
+ program.addLine("Set #{total_shower_time} = 0")
+ shower_unmet_time_vars.each_with_index do |shower_unmet_time_var, _i|
+ program.addLine("Set #{unit_shower_unmet_time} = #{shower_unmet_time_var.name}")
+ program.addLine(" If #{unit_shower_unmet_time} > #{total_shower_unmet_time}") # Use max hourly value across all units
+ program.addLine(" Set #{total_shower_unmet_time} = #{unit_shower_unmet_time}")
+ program.addLine(' EndIf')
+ end
+ shower_time_vars.each_with_index do |shower_time_var, _i|
+ program.addLine("Set #{unit_shower_time} = #{shower_time_var.name}")
+ program.addLine(" If #{unit_shower_time} > #{total_shower_time}") # Use max hourly value across all units
+ program.addLine(" Set #{total_shower_time} = #{unit_shower_time}")
+ program.addLine(' EndIf')
+ end
+
+ # EMS calling manager
+ Model.add_ems_program_calling_manager(
+ model,
+ name: "#{program.name} calling manager",
+ calling_point: 'EndOfZoneTimestepAfterZoneReporting',
+ ems_programs: [program]
+ )
+ end
+
# Creates an EMS program that calculates total heating and cooling loads delivered
# by the HVAC system(s).
#
@@ -1176,9 +1228,9 @@ def self.append_sizing_results(hpxml_bldgs, results_out)
line_break = nil
# Summary HVAC capacities
- results_out << ['HVAC Capacity: Heating (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| Outputs.get_total_hvac_capacities(hpxml_bldg)[0] }.sum(0.0).round(1)]
- results_out << ['HVAC Capacity: Cooling (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| Outputs.get_total_hvac_capacities(hpxml_bldg)[1] }.sum(0.0).round(1)]
- results_out << ['HVAC Capacity: Heat Pump Backup (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| Outputs.get_total_hvac_capacities(hpxml_bldg)[2] }.sum(0.0).round(1)]
+ results_out << ['HVAC Capacity: Heating (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| get_total_hvac_capacities(hpxml_bldg)[0] }.sum(0.0).round(1)]
+ results_out << ['HVAC Capacity: Cooling (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| get_total_hvac_capacities(hpxml_bldg)[1] }.sum(0.0).round(1)]
+ results_out << ['HVAC Capacity: Heat Pump Backup (Btu/h)', hpxml_bldgs.map { |hpxml_bldg| get_total_hvac_capacities(hpxml_bldg)[2] }.sum(0.0).round(1)]
# HVAC design temperatures
results_out <<