diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index a64def1eb6..820251f327 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.1
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- 3bbf80cf-05f6-4f6b-951c-5062027543f9
- 2023-10-31T23:05:40Z
+ e3c3d6b8-7931-4e31-a544-f4b168b10038
+ 2023-10-31T23:17:38Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -526,7 +526,7 @@
test_airflow.rb
rb
test
- 08FBF340
+ 2C8BEE99
test_battery.rb
@@ -538,31 +538,31 @@
test_defaults.rb
rb
test
- 5B44A601
+ 0A8B4E8E
test_enclosure.rb
rb
test
- 5930894C
+ 8B84C7C1
test_generator.rb
rb
test
- 97A15E98
+ C4F6CF9B
test_hotwater_appliance.rb
rb
test
- 036F8EB5
+ 9247176A
test_hvac.rb
rb
test
- B4F35407
+ 2DA48649
test_hvac_sizing.rb
@@ -592,7 +592,7 @@
test_pv.rb
rb
test
- 8CA3E0BF
+ DB1DEFCF
test_schedules.rb
@@ -610,13 +610,13 @@
test_validation.rb
rb
test
- 071584D9
+ D5F711DA
test_water_heater.rb
rb
test
- A0949176
+ 3181EB84
test_weather.rb
diff --git a/HPXMLtoOpenStudio/tests/test_airflow.rb b/HPXMLtoOpenStudio/tests/test_airflow.rb
index 07e5e68323..fa6e0c5f2d 100644
--- a/HPXMLtoOpenStudio/tests/test_airflow.rb
+++ b/HPXMLtoOpenStudio/tests/test_airflow.rb
@@ -133,7 +133,7 @@ def test_infiltration_natural_ela
def test_infiltration_multifamily
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit.xml'))
model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
# Check infiltration/ventilation program
@@ -145,7 +145,7 @@ def test_infiltration_multifamily
def test_infiltration_multifamily_compartmentalization
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-infil-compartmentalization-test.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-infil-compartmentalization-test.xml'))
model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
# Check infiltration/ventilation program
@@ -497,7 +497,7 @@ def test_multiple_mechvent
def test_shared_mechvent_multiple
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-mechvent-multiple.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-mechvent-multiple.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -664,7 +664,7 @@ def test_infiltration_compartmentalization_area
assert_in_delta(3900, total_area, 1.0)
# Test multifamily
- _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily.xml')
+ _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
total_area, exterior_area = hpxml_bldg.compartmentalization_boundary_areas
assert_in_delta(686, exterior_area, 1.0)
assert_in_delta(2780, total_area, 1.0)
diff --git a/HPXMLtoOpenStudio/tests/test_defaults.rb b/HPXMLtoOpenStudio/tests/test_defaults.rb
index 1320b3c61b..6d0ff563f7 100644
--- a/HPXMLtoOpenStudio/tests/test_defaults.rb
+++ b/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -493,7 +493,7 @@ def test_infiltration_compartmentaliztion_test_adjustment
_test_default_infiltration_compartmentalization_test_values(default_hpxml_bldg.air_infiltration_measurements[0], nil)
# Test single-family attached not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitTotal
hpxml_bldg.air_infiltration_measurements[0].a_ext = 0.5
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
@@ -512,7 +512,7 @@ def test_infiltration_compartmentaliztion_test_adjustment
_test_default_infiltration_compartmentalization_test_values(default_hpxml_bldg.air_infiltration_measurements[0], 0.817)
# Test multifamily not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
hpxml_bldg.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitTotal
hpxml_bldg.air_infiltration_measurements[0].a_ext = 0.5
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
@@ -1351,7 +1351,7 @@ def test_boilers
_test_default_boiler_values(default_hpxml_bldg.heating_systems[0], 170.0, nil, true, 500)
# Test inputs not overridden by defaults (shared boiler)
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-boiler-only-baseboard.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml')
hpxml_bldg.heating_systems[0].shared_loop_watts = nil
hpxml_bldg.heating_systems[0].electric_auxiliary_energy = 99.9
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
@@ -1899,7 +1899,7 @@ def test_hvac_distribution
expected_supply_buried_levels, expected_return_buried_levels, expected_supply_effective_rvalues, expected_return_effective_rvalues)
# Test defaults w/ building/unit adjacent to other housing unit
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml')
hpxml_bldg.hvac_distributions[0].conditioned_floor_area_served = 900.0
hpxml_bldg.hvac_distributions[0].number_of_return_registers = 1
hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
@@ -2065,7 +2065,7 @@ def test_hvac_distribution
def test_mech_ventilation_fans
# Test inputs not overridden by defaults w/ shared exhaust system
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.ventilation_fans.add(id: 'MechanicalVentilation',
fan_type: HPXML::MechVentTypeExhaust,
used_for_whole_building_ventilation: true,
@@ -2125,7 +2125,7 @@ def test_mech_ventilation_fans
_test_default_mech_vent_values(default_hpxml_bldg, false, 24.0, 27.1, 77.3)
# Test defaults w/ SFA building, compartmentalization test
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitTotal
hpxml_bldg.ventilation_fans.add(id: 'MechanicalVentilation',
fan_type: HPXML::MechVentTypeExhaust,
@@ -2141,7 +2141,7 @@ def test_mech_ventilation_fans
_test_default_mech_vent_values(default_hpxml_bldg, false, 24.0, 27.2, 77.3)
# Test defaults w/ MF building, compartmentalization test
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
hpxml_bldg.air_infiltration_measurements[0].infiltration_type = HPXML::InfiltrationTypeUnitTotal
hpxml_bldg.ventilation_fans.add(id: 'MechanicalVentilation',
fan_type: HPXML::MechVentTypeExhaust,
@@ -2309,7 +2309,7 @@ def test_whole_house_fan
def test_storage_water_heaters
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.water_heating_systems.each do |wh|
wh.is_shared_system = true
wh.number_of_units_served = 2
@@ -2486,7 +2486,7 @@ def test_hot_water_distribution
_test_default_recirc_distribution_values(default_hpxml_bldg.hot_water_distributions[0], 50.0, 50.0, 65.0, 2.5)
# Test inputs not overridden by defaults -- shared recirculation
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-water-heater-recirc.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-water-heater-recirc.xml')
hpxml_bldg.hot_water_distributions[0].shared_recirculation_pump_power = 333.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
@@ -2547,7 +2547,7 @@ def test_hot_water_distribution
_test_default_recirc_distribution_values(default_hpxml_bldg.hot_water_distributions[0], 186.96, 10.0, 50.0, 0.0)
# Test defaults w/ shared recirculation
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-water-heater-recirc.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-water-heater-recirc.xml')
hpxml_bldg.hot_water_distributions[0].shared_recirculation_pump_power = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
@@ -2609,7 +2609,7 @@ def test_solar_thermal_systems
def test_pv_systems
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.pv_systems.add(id: 'PVSystem',
is_shared_system: true,
number_of_bedrooms_served: 20,
@@ -2753,7 +2753,7 @@ def test_batteries
def test_generators
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.generators.add(id: 'Generator',
is_shared_system: true,
number_of_bedrooms_served: 20,
@@ -2774,7 +2774,7 @@ def test_generators
def test_clothes_washers
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.water_heating_systems[0].is_shared_system = true
hpxml_bldg.water_heating_systems[0].number_of_units_served = 6
hpxml_bldg.clothes_washers[0].location = HPXML::LocationBasementConditioned
@@ -2829,7 +2829,7 @@ def test_clothes_washers
def test_clothes_dryers
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.water_heating_systems[0].is_shared_system = true
hpxml_bldg.water_heating_systems[0].number_of_units_served = 6
hpxml_bldg.clothes_dryers[0].location = HPXML::LocationBasementConditioned
@@ -2902,7 +2902,7 @@ def test_clothes_dryer_exhaust
def test_dishwashers
# Test inputs not overridden by defaults
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
hpxml_bldg.water_heating_systems[0].is_shared_system = true
hpxml_bldg.water_heating_systems[0].number_of_units_served = 6
hpxml_bldg.dishwashers[0].location = HPXML::LocationBasementConditioned
diff --git a/HPXMLtoOpenStudio/tests/test_enclosure.rb b/HPXMLtoOpenStudio/tests/test_enclosure.rb
index 5bf8e080e1..03e6272fad 100644
--- a/HPXMLtoOpenStudio/tests/test_enclosure.rb
+++ b/HPXMLtoOpenStudio/tests/test_enclosure.rb
@@ -726,7 +726,7 @@ def test_foundation_properties
'base-foundation-walkout-basement.xml' => 2, # 1 basement foundation with 1 effective below-grade depth + additional no-wall exposed perimeter
'base-foundation-multiple.xml' => 2, # 1 basement foundation + 1 crawlspace foundation
'base-foundation-complex.xml' => 6, # 2 basement foundations, each with 1 effective below-grade depth + additional no-wall exposed perimeter
- 'base-bldgtype-attached-2stories.xml' => 1, # 1 basement foundation
+ 'base-bldgtype-sfa-unit-2stories.xml' => 1, # 1 basement foundation
'base-enclosure-2stories-garage.xml' => 2, # 1 basement foundation + 1 garage slab
}
@@ -983,7 +983,7 @@ def get_num_surfaces_by_type(hpxml_bldg)
def test_aspect_ratios
# Test single-family attached
- _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-attached.xml')
+ _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-sfa-unit.xml')
wall_outside = hpxml_bldg.walls.find { |w| w.exterior_adjacent_to == HPXML::LocationOutside && w.interior_adjacent_to == HPXML::LocationConditionedSpace }
wall_other_housing_unit = hpxml_bldg.walls.find { |w| w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit && w.interior_adjacent_to == HPXML::LocationConditionedSpace }
@@ -993,7 +993,7 @@ def test_aspect_ratios
assert_in_delta(0.6667, front_back_wall_length / left_right_wall_length, 0.01)
# Test multifamily
- _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily.xml')
+ _hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
wall_outside = hpxml_bldg.walls.find { |w| w.exterior_adjacent_to == HPXML::LocationOutside && w.interior_adjacent_to == HPXML::LocationConditionedSpace }
wall_other_housing_unit = hpxml_bldg.walls.find { |w| w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit && w.interior_adjacent_to == HPXML::LocationConditionedSpace }
diff --git a/HPXMLtoOpenStudio/tests/test_generator.rb b/HPXMLtoOpenStudio/tests/test_generator.rb
index 0f5b89f37b..3c671bd148 100644
--- a/HPXMLtoOpenStudio/tests/test_generator.rb
+++ b/HPXMLtoOpenStudio/tests/test_generator.rb
@@ -42,7 +42,7 @@ def test_generator
def test_generator_shared
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-generator.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-generator.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
hpxml_bldg.generators.each do |hpxml_generator|
diff --git a/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb b/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
index f63d8263c2..08c9203e2b 100644
--- a/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
+++ b/HPXMLtoOpenStudio/tests/test_hotwater_appliance.rb
@@ -233,7 +233,7 @@ def test_dhw_multiple
def test_dhw_shared_water_heater_recirc
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-water-heater-recirc.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-water-heater-recirc.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# water use equipment peak flows
@@ -301,7 +301,7 @@ def test_dhw_shared_water_heater_recirc
def test_dhw_shared_laundry
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-laundry-room.xml'))
model, _hpxml, _hpxml_bldg = _test_measure(args_hash)
# water use equipment peak flows
diff --git a/HPXMLtoOpenStudio/tests/test_hvac.rb b/HPXMLtoOpenStudio/tests/test_hvac.rb
index c0c25e8019..8b013f3d1e 100644
--- a/HPXMLtoOpenStudio/tests/test_hvac.rb
+++ b/HPXMLtoOpenStudio/tests/test_hvac.rb
@@ -716,7 +716,7 @@ def test_ground_to_air_heat_pump
def test_shared_chiller_baseboard
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-chiller-only-baseboard.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -733,7 +733,7 @@ def test_shared_chiller_baseboard
def test_shared_chiller_fan_coil
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -750,7 +750,7 @@ def test_shared_chiller_fan_coil
def test_shared_chiller_water_loop_heat_pump
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -767,7 +767,7 @@ def test_shared_chiller_water_loop_heat_pump
def test_shared_cooling_tower_water_loop_heat_pump
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -784,7 +784,7 @@ def test_shared_cooling_tower_water_loop_heat_pump
def test_shared_boiler_baseboard
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-boiler-only-baseboard.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -803,7 +803,7 @@ def test_shared_boiler_baseboard
def test_shared_boiler_fan_coil
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -822,7 +822,7 @@ def test_shared_boiler_fan_coil
def test_shared_boiler_water_loop_heat_pump
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -855,7 +855,7 @@ def test_shared_boiler_water_loop_heat_pump
def test_shared_ground_loop_ground_to_air_heat_pump
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
diff --git a/HPXMLtoOpenStudio/tests/test_pv.rb b/HPXMLtoOpenStudio/tests/test_pv.rb
index cd558d2f6f..f92f0380dd 100644
--- a/HPXMLtoOpenStudio/tests/test_pv.rb
+++ b/HPXMLtoOpenStudio/tests/test_pv.rb
@@ -49,7 +49,7 @@ def test_pv
def test_pv_shared
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-pv.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-pv.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
hpxml_bldg.pv_systems.each do |pv_system|
diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb
index 360293aad9..61f327d67a 100644
--- a/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -283,7 +283,7 @@ def test_schema_schematron_error_messages
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.building_construction.conditioned_floor_area = 1348.8
elsif ['enclosure-floor-area-exceeds-cfa2'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit.xml')
hpxml_bldg.building_construction.conditioned_floor_area = 898.8
elsif ['enclosure-garage-missing-exterior-wall'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base-enclosure-garage.xml')
@@ -338,7 +338,7 @@ def test_schema_schematron_error_messages
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.heating_systems[0].heating_efficiency_afue *= 100.0
elsif ['generator-number-of-bedrooms-served'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-generator.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-generator.xml')
hpxml_bldg.generators[0].number_of_bedrooms_served = 3
elsif ['generator-output-greater-than-consumption'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base-misc-generators.xml')
@@ -419,7 +419,7 @@ def test_schema_schematron_error_messages
hpxml_bldg.hvac_distributions[0].ducts[2].duct_fraction_area = 0.15
hpxml_bldg.hvac_distributions[0].ducts[3].duct_fraction_area = 0.15
elsif ['invalid-facility-type'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-laundry-room.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
hpxml_bldg.building_construction.residential_facility_type = HPXML::ResidentialTypeSFD
elsif ['invalid-foundation-wall-properties'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base-foundation-unconditioned-basement-wall-insulation.xml')
@@ -497,19 +497,19 @@ def test_schema_schematron_error_messages
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.header.natvent_days_per_week = -1
elsif ['invalid-number-of-bedrooms-served'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-pv.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-pv.xml')
hpxml_bldg.pv_systems[0].number_of_bedrooms_served = 3
elsif ['invalid-number-of-conditioned-floors'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.building_construction.number_of_conditioned_floors_above_grade = 3
elsif ['invalid-number-of-units-served'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-water-heater.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-water-heater.xml')
hpxml_bldg.water_heating_systems[0].number_of_units_served = 1
elsif ['invalid-pilot-light-heating-system'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base-hvac-floor-furnace-propane-only-pilot-light.xml')
hpxml_bldg.heating_systems[0].heating_system_fuel = HPXML::FuelTypeElectricity
elsif ['invalid-shared-vent-in-unit-flowrate'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-mechvent.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-mechvent.xml')
hpxml_bldg.ventilation_fans[0].rated_flow_rate = 80
elsif ['invalid-timestep'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base.xml')
@@ -1052,7 +1052,7 @@ def test_ruby_error_messages
hpxml_bldg.cooling_systems[0].fan_watts_per_cfm = 0.55
hpxml_bldg.heating_systems[0].fan_watts_per_cfm = 0.45
elsif ['hvac-shared-boiler-multiple'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-boiler-only-baseboard.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml')
hpxml_bldg.hvac_distributions << hpxml_bldg.hvac_distributions[0].dup
hpxml_bldg.hvac_distributions[-1].id = "HVACDistribution#{hpxml_bldg.hvac_distributions.size}"
hpxml_bldg.heating_systems[0].fraction_heat_load_served = 0.5
@@ -1062,7 +1062,7 @@ def test_ruby_error_messages
hpxml_bldg.heating_systems[1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
hpxml_bldg.heating_systems[1].primary_system = true
elsif ['hvac-shared-chiller-multiple'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-chiller-only-baseboard.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml')
hpxml_bldg.hvac_distributions << hpxml_bldg.hvac_distributions[0].dup
hpxml_bldg.hvac_distributions[-1].id = "HVACDistribution#{hpxml_bldg.hvac_distributions.size}"
hpxml_bldg.cooling_systems[0].fraction_cool_load_served = 0.5
@@ -1072,7 +1072,7 @@ def test_ruby_error_messages
hpxml_bldg.cooling_systems[1].distribution_system_idref = hpxml_bldg.hvac_distributions[-1].id
hpxml_bldg.cooling_systems[1].primary_system = true
elsif ['hvac-shared-chiller-negative-seer-eq'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-chiller-only-baseboard.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml')
hpxml_bldg.cooling_systems[0].shared_loop_watts *= 100.0
elsif ['invalid-battery-capacity-units'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base-pv-battery.xml')
@@ -1277,18 +1277,18 @@ def test_ruby_error_messages
hpxml, hpxml_bldg = _create_hpxml('base-dhw-solar-indirect-flat-plate.xml')
hpxml_bldg.solar_thermal_systems[0].water_heating_system_idref = 'foobar'
elsif ['unattached-shared-clothes-washer-dhw-distribution'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-laundry-room.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
hpxml_bldg.clothes_washers[0].water_heating_system_idref = nil
hpxml_bldg.clothes_washers[0].hot_water_distribution_idref = 'foobar'
elsif ['unattached-shared-clothes-washer-water-heater'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-laundry-room.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
hpxml_bldg.clothes_washers[0].water_heating_system_idref = 'foobar'
elsif ['unattached-shared-dishwasher-dhw-distribution'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-laundry-room.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
hpxml_bldg.dishwashers[0].water_heating_system_idref = nil
hpxml_bldg.dishwashers[0].hot_water_distribution_idref = 'foobar'
elsif ['unattached-shared-dishwasher-water-heater'].include? error_case
- hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-multifamily-shared-laundry-room.xml')
+ hpxml, hpxml_bldg = _create_hpxml('base-bldgtype-mf-unit-shared-laundry-room.xml')
hpxml_bldg.dishwashers[0].water_heating_system_idref = 'foobar'
elsif ['unattached-window'].include? error_case
hpxml, hpxml_bldg = _create_hpxml('base.xml')
diff --git a/HPXMLtoOpenStudio/tests/test_water_heater.rb b/HPXMLtoOpenStudio/tests/test_water_heater.rb
index 69af6fd47a..68951c2d8e 100644
--- a/HPXMLtoOpenStudio/tests/test_water_heater.rb
+++ b/HPXMLtoOpenStudio/tests/test_water_heater.rb
@@ -1033,7 +1033,7 @@ def test_tank_jacket
def test_shared_water_heater
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-water-heater.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-water-heater.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
@@ -1063,7 +1063,7 @@ def test_shared_water_heater
def test_shared_laundry_room
args_hash = {}
- args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-multifamily-shared-laundry-room.xml'))
+ args_hash['hpxml_path'] = File.absolute_path(File.join(sample_files_dir, 'base-bldgtype-mf-unit-shared-laundry-room.xml'))
model, _hpxml, hpxml_bldg = _test_measure(args_hash)
# Get HPXML values
diff --git a/ReportSimulationOutput/measure.xml b/ReportSimulationOutput/measure.xml
index 247077a96d..504e0a1284 100644
--- a/ReportSimulationOutput/measure.xml
+++ b/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
3.1
report_simulation_output
df9d170c-c21a-4130-866d-0d46b06073fd
- f719361f-8e3f-4dc9-9c95-575bbc0e5224
- 2023-10-31T20:02:42Z
+ 4712f2cf-bc40-44a5-adcd-510753e7d728
+ 2023-10-31T23:17:40Z
9BF1E6AC
ReportSimulationOutput
HPXML Simulation Output Report
@@ -1935,7 +1935,7 @@
output_report_test.rb
rb
test
- D0B7C5A9
+ 06094EBC
diff --git a/ReportSimulationOutput/tests/output_report_test.rb b/ReportSimulationOutput/tests/output_report_test.rb
index 1ddcd0b46a..c2310eb7a5 100644
--- a/ReportSimulationOutput/tests/output_report_test.rb
+++ b/ReportSimulationOutput/tests/output_report_test.rb
@@ -1022,7 +1022,7 @@ def test_timeseries_hourly_zone_temperatures_without_cooling
end
def test_timeseries_hourly_zone_temperatures_mf_space
- args_hash = { 'hpxml_path' => File.join(File.dirname(__FILE__), '../../workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml'),
+ args_hash = { 'hpxml_path' => File.join(File.dirname(__FILE__), '../../workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml'),
'skip_validation' => true,
'timeseries_frequency' => 'hourly',
'include_timeseries_zone_temperatures' => true }
diff --git a/tasks.rb b/tasks.rb
index a9078926c9..3b72e61cc1 100644
--- a/tasks.rb
+++ b/tasks.rb
@@ -305,7 +305,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
hpxml_bldg.building_construction.conditioned_floor_area -= 400 * 2
hpxml_bldg.building_construction.conditioned_building_volume -= 400 * 2 * 8
hpxml_bldg.air_infiltration_measurements[0].infiltration_volume = hpxml_bldg.building_construction.conditioned_building_volume
- elsif ['base-bldgtype-multifamily-infil-compartmentalization-test.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-infil-compartmentalization-test.xml'].include? hpxml_file
hpxml_bldg.air_infiltration_measurements[0].a_ext = 0.2
end
@@ -365,17 +365,17 @@ def apply_hpxml_modification(hpxml_file, hpxml)
end
# Logic that can only be applied based on the file name
- if ['base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml',
- 'base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml',
- 'base-bldgtype-multifamily-adjacent-to-other-heated-space.xml',
- 'base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml'].include? hpxml_file
- if hpxml_file == 'base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml'
+ if ['base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml',
+ 'base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml',
+ 'base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml',
+ 'base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml'].include? hpxml_file
+ if hpxml_file == 'base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml'
adjacent_to = HPXML::LocationOtherMultifamilyBufferSpace
- elsif hpxml_file == 'base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml'
+ elsif hpxml_file == 'base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml'
adjacent_to = HPXML::LocationOtherNonFreezingSpace
- elsif hpxml_file == 'base-bldgtype-multifamily-adjacent-to-other-heated-space.xml'
+ elsif hpxml_file == 'base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml'
adjacent_to = HPXML::LocationOtherHeatedSpace
- elsif hpxml_file == 'base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml'
+ elsif hpxml_file == 'base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml'
adjacent_to = HPXML::LocationOtherHousingUnit
end
wall = hpxml_bldg.walls.select { |w|
@@ -385,7 +385,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
wall.exterior_adjacent_to = adjacent_to
hpxml_bldg.floors[0].exterior_adjacent_to = adjacent_to
hpxml_bldg.floors[1].exterior_adjacent_to = adjacent_to
- if hpxml_file != 'base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml'
+ if hpxml_file != 'base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml'
wall.insulation_assembly_r_value = 23
hpxml_bldg.floors[0].insulation_assembly_r_value = 18.7
hpxml_bldg.floors[1].insulation_assembly_r_value = 18.7
@@ -406,7 +406,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
hpxml_bldg.dishwashers[0].location = adjacent_to
hpxml_bldg.refrigerators[0].location = adjacent_to
hpxml_bldg.cooking_ranges[0].location = adjacent_to
- elsif ['base-bldgtype-multifamily-adjacent-to-multiple.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-adjacent-to-multiple.xml'].include? hpxml_file
wall = hpxml_bldg.walls.select { |w|
w.interior_adjacent_to == HPXML::LocationConditionedSpace &&
w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit
@@ -1621,7 +1621,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
primary_cooling_system: true,
primary_heating_system: true)
elsif ['base-mechvent-multiple.xml',
- 'base-bldgtype-multifamily-shared-mechvent-multiple.xml'].include? hpxml_file
+ 'base-bldgtype-mf-unit-shared-mechvent-multiple.xml'].include? hpxml_file
hpxml_bldg.hvac_distributions.add(id: "HVACDistribution#{hpxml_bldg.hvac_distributions.size + 1}",
distribution_system_type: HPXML::HVACDistributionTypeAir,
air_type: HPXML::AirTypeRegularVelocity)
@@ -1645,7 +1645,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
hpxml_bldg.cooling_systems[1].id = "CoolingSystem#{hpxml_bldg.cooling_systems.size}"
hpxml_bldg.cooling_systems[1].distribution_system_idref = hpxml_bldg.hvac_distributions[1].id
hpxml_bldg.cooling_systems[1].primary_system = true
- elsif ['base-bldgtype-multifamily-adjacent-to-multiple.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-adjacent-to-multiple.xml'].include? hpxml_file
hpxml_bldg.hvac_distributions[0].ducts[1].duct_location = HPXML::LocationOtherHousingUnit
hpxml_bldg.hvac_distributions[0].ducts.add(id: "Ducts#{hpxml_bldg.hvac_distributions[0].ducts.size + 1}",
duct_type: HPXML::DuctTypeSupply,
@@ -1704,13 +1704,13 @@ def apply_hpxml_modification(hpxml_file, hpxml)
hpxml_bldg.water_heating.water_fixtures_weekday_fractions = '0.012, 0.006, 0.004, 0.005, 0.010, 0.034, 0.078, 0.087, 0.080, 0.067, 0.056, 0.047, 0.040, 0.035, 0.033, 0.031, 0.039, 0.051, 0.060, 0.060, 0.055, 0.048, 0.038, 0.026'
hpxml_bldg.water_heating.water_fixtures_weekend_fractions = '0.012, 0.006, 0.004, 0.005, 0.010, 0.034, 0.078, 0.087, 0.080, 0.067, 0.056, 0.047, 0.040, 0.035, 0.033, 0.031, 0.039, 0.051, 0.060, 0.060, 0.055, 0.048, 0.038, 0.026'
hpxml_bldg.water_heating.water_fixtures_monthly_multipliers = '1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0'
- elsif ['base-bldgtype-multifamily-shared-water-heater-recirc.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-shared-water-heater-recirc.xml'].include? hpxml_file
hpxml_bldg.hot_water_distributions[0].has_shared_recirculation = true
hpxml_bldg.hot_water_distributions[0].shared_recirculation_number_of_units_served = 6
hpxml_bldg.hot_water_distributions[0].shared_recirculation_pump_power = 220
hpxml_bldg.hot_water_distributions[0].shared_recirculation_control_type = HPXML::DHWRecirControlTypeTimer
- elsif ['base-bldgtype-multifamily-shared-laundry-room.xml',
- 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-shared-laundry-room.xml',
+ 'base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
hpxml_bldg.water_heating_systems.reverse_each do |water_heating_system|
water_heating_system.delete
end
@@ -1726,7 +1726,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
energy_factor: 0.59,
recovery_efficiency: 0.76,
temperature: 125.0)
- if hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'
+ if hpxml_file == 'base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml'
hpxml_bldg.water_heating_systems[0].fraction_dhw_load_served /= 2.0
hpxml_bldg.water_heating_systems[0].tank_volume /= 2.0
hpxml_bldg.water_heating_systems[0].number_of_units_served /= 2.0
@@ -1796,7 +1796,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
# -------------------- #
# Logic that can only be applied based on the file name
- if ['base-bldgtype-multifamily-shared-mechvent-multiple.xml'].include? hpxml_file
+ if ['base-bldgtype-mf-unit-shared-mechvent-multiple.xml'].include? hpxml_file
hpxml_bldg.ventilation_fans.add(id: "VentilationFan#{hpxml_bldg.ventilation_fans.size + 1}",
fan_type: HPXML::MechVentTypeSupply,
is_shared_system: true,
@@ -1999,7 +1999,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
fuel_type: HPXML::FuelTypeOil,
annual_consumption_kbtu: 8500,
annual_output_kwh: 1200)
- elsif ['base-bldgtype-multifamily-shared-generator.xml'].include? hpxml_file
+ elsif ['base-bldgtype-mf-unit-shared-generator.xml'].include? hpxml_file
hpxml_bldg.generators.add(id: "Generator#{hpxml_bldg.generators.size + 1}",
is_shared_system: true,
fuel_type: HPXML::FuelTypePropane,
@@ -2084,18 +2084,18 @@ def apply_hpxml_modification(hpxml_file, hpxml)
hpxml_bldg.permanent_spas[0].heater_weekend_fractions = '0.024, 0.029, 0.024, 0.029, 0.047, 0.067, 0.057, 0.024, 0.024, 0.019, 0.015, 0.014, 0.014, 0.014, 0.024, 0.058, 0.126, 0.122, 0.068, 0.061, 0.051, 0.043, 0.024, 0.024'
hpxml_bldg.permanent_spas[0].heater_monthly_multipliers = '0.921, 0.928, 0.921, 0.915, 0.921, 1.160, 1.158, 1.158, 1.160, 0.921, 0.915, 0.921'
end
- if ['base-bldgtype-multifamily-shared-laundry-room.xml',
- 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
+ if ['base-bldgtype-mf-unit-shared-laundry-room.xml',
+ 'base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml'].include? hpxml_file
hpxml_bldg.clothes_washers[0].is_shared_appliance = true
hpxml_bldg.clothes_washers[0].location = HPXML::LocationOtherHeatedSpace
hpxml_bldg.clothes_dryers[0].location = HPXML::LocationOtherHeatedSpace
hpxml_bldg.clothes_dryers[0].is_shared_appliance = true
hpxml_bldg.dishwashers[0].is_shared_appliance = true
hpxml_bldg.dishwashers[0].location = HPXML::LocationOtherHeatedSpace
- if hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room.xml'
+ if hpxml_file == 'base-bldgtype-mf-unit-shared-laundry-room.xml'
hpxml_bldg.clothes_washers[0].water_heating_system_idref = hpxml_bldg.water_heating_systems[0].id
hpxml_bldg.dishwashers[0].water_heating_system_idref = hpxml_bldg.water_heating_systems[0].id
- elsif hpxml_file == 'base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml'
+ elsif hpxml_file == 'base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml'
hpxml_bldg.clothes_washers[0].hot_water_distribution_idref = hpxml_bldg.hot_water_distributions[0].id
hpxml_bldg.dishwashers[0].hot_water_distribution_idref = hpxml_bldg.hot_water_distributions[0].id
end
diff --git a/workflow/hpxml_inputs.json b/workflow/hpxml_inputs.json
index 3ed27e7eb2..9fb9f05122 100644
--- a/workflow/hpxml_inputs.json
+++ b/workflow/hpxml_inputs.json
@@ -748,7 +748,7 @@
"parent_hpxml": "sample_files/base-battery.xml",
"schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/battery.csv"
},
- "sample_files/base-bldgtype-attached.xml": {
+ "sample_files/base-bldgtype-sfa-unit.xml": {
"parent_hpxml": "sample_files/base.xml",
"geometry_unit_type": "single-family attached",
"geometry_unit_right_wall_is_adiabatic": true,
@@ -767,8 +767,8 @@
"heating_system_heating_capacity": 24000,
"misc_plug_loads_other_annual_kwh": 1638
},
- "sample_files/base-bldgtype-attached-2stories.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-attached.xml",
+ "sample_files/base-bldgtype-sfa-unit-2stories.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-sfa-unit.xml",
"geometry_unit_num_floors_above_grade": 2,
"geometry_unit_cfa": 2700,
"heating_system_heating_capacity": 48000,
@@ -777,20 +777,20 @@
"ducts_return_surface_area": 37.5,
"misc_plug_loads_other_annual_kwh": 2457
},
- "sample_files/base-bldgtype-attached-atticroof-cathedral.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-attached-2stories.xml",
+ "sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-sfa-unit-2stories.xml",
"geometry_attic_type": "ConditionedAttic",
"ducts_supply_leakage_to_outside_value": 0,
"ducts_return_leakage_to_outside_value": 0,
"ducts_supply_location": "conditioned space",
"ducts_return_location": "conditioned space"
},
- "sample_files/base-bldgtype-attached-infil-compartmentalization-test.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-attached.xml",
+ "sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-sfa-unit.xml",
"air_leakage_value": 3.57,
"air_leakage_type": "unit total"
},
- "sample_files/base-bldgtype-multifamily.xml": {
+ "sample_files/base-bldgtype-mf-unit.xml": {
"parent_hpxml": "sample_files/base.xml",
"geometry_unit_type": "apartment unit",
"geometry_unit_right_wall_is_adiabatic": true,
@@ -818,81 +818,81 @@
"ducts_return_location": "conditioned space",
"misc_plug_loads_other_annual_kwh": 819
},
- "sample_files/base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-adjacent-to-other-heated-space.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-infil-compartmentalization-test.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"air_leakage_value": 12.16,
"air_leakage_type": "unit total"
},
- "sample_files/base-bldgtype-multifamily-residents-1.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-residents-1.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"geometry_unit_num_occupants": 1,
"misc_plug_loads_television_annual_kwh": null,
"misc_plug_loads_other_annual_kwh": null
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"heating_system_type": "Shared Boiler w/ Baseboard",
"cooling_system_type": "none",
"cooling_system_cooling_efficiency": 0,
"cooling_system_fraction_cool_load_served": 0
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml",
"heating_system_type": "Shared Boiler w/ Ductless Fan Coil"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil-ducted.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-cooling-tower-water-loop-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"heating_system_type": "Shared Boiler w/ Baseboard",
"cooling_system_type": "none",
"cooling_system_cooling_efficiency": 0,
"cooling_system_fraction_cool_load_served": 0
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml",
"heating_system_type": "Shared Boiler w/ Ductless Fan Coil"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-fireplace-elec.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml",
"heating_system_fraction_heat_load_served": 0.75,
"heating_system_2_type": "Fireplace",
"heating_system_2_heating_efficiency": 1.0,
"heating_system_2_fraction_heat_load_served": 0.25
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-ducted.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-eae.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"heating_system_type": "none",
"heating_system_heating_efficiency": 0,
"heating_system_fraction_heat_load_served": 0,
@@ -900,32 +900,32 @@
"cooling_system_cooling_efficiency": 0,
"cooling_system_fraction_cool_load_served": 0
},
- "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil-ducted.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-generator.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-generator.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-laundry-room.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-laundry-room.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-mechvent.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-mechvent.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"mech_vent_fan_type": "supply only",
"mech_vent_flow_rate": 800,
"mech_vent_hours_in_operation": 24,
@@ -941,11 +941,11 @@
"mech_vent_2_sensible_recovery_efficiency": 0.72,
"mech_vent_2_fan_power": 26
},
- "sample_files/base-bldgtype-multifamily-shared-mechvent-multiple.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml"
},
- "sample_files/base-bldgtype-multifamily-shared-mechvent-preconditioning.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-mechvent.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-mechvent.xml",
"mech_vent_shared_preheating_fuel": "natural gas",
"mech_vent_shared_preheating_efficiency": 0.92,
"mech_vent_shared_preheating_fraction_heat_load_served": 0.7,
@@ -953,8 +953,8 @@
"mech_vent_shared_precooling_efficiency": 4,
"mech_vent_shared_precooling_fraction_cool_load_served": 0.8
},
- "sample_files/base-bldgtype-multifamily-shared-pv.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-pv.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"pv_system_present": true,
"pv_system_module_type": "standard",
"pv_system_location": "ground",
@@ -966,8 +966,8 @@
"pv_system_system_losses_fraction": 0.14,
"pv_system_num_bedrooms_served": 18
},
- "sample_files/base-bldgtype-multifamily-shared-water-heater.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "sample_files/base-bldgtype-mf-unit-shared-water-heater.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"water_heater_fuel_type": "natural gas",
"water_heater_tank_volume": 120,
"water_heater_efficiency": 0.59,
@@ -975,8 +975,8 @@
"water_heater_heating_capacity": 40000,
"water_heater_num_units_served": 6
},
- "sample_files/base-bldgtype-multifamily-shared-water-heater-recirc.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily-shared-water-heater.xml"
+ "sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml": {
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit-shared-water-heater.xml"
},
"sample_files/base-dhw-combi-tankless.xml": {
"parent_hpxml": "sample_files/base-dhw-indirect.xml",
@@ -2706,7 +2706,7 @@
"neighbor_front_height": 12
},
"sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml": {
- "parent_hpxml": "sample_files/base-bldgtype-multifamily.xml",
+ "parent_hpxml": "sample_files/base-bldgtype-mf-unit.xml",
"neighbor_right_distance": 15,
"combine_like_surfaces": false
},
diff --git a/workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multifamily-buffer-space.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-adjacent-to-multiple.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-adjacent-to-non-freezing-space.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-adjacent-to-other-heated-space.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-adjacent-to-other-heated-space.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-adjacent-to-other-housing-unit.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-infil-compartmentalization-test.xml b/workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-infil-compartmentalization-test.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-residents-1.xml b/workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-residents-1.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-baseboard.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil-ducted.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil-ducted.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-fan-coil.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-chiller-water-loop-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-cooling-tower-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-cooling-tower-water-loop-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-baseboard.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-ducted.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-ducted.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-eae.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-eae.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-fireplace-elec.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil-fireplace-elec.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-fan-coil.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-boiler-only-water-loop-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-baseboard.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil-ducted.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil-ducted.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-fan-coil.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-chiller-only-water-loop-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-cooling-tower-only-water-loop-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-generator.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-generator.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-ground-loop-ground-to-air-heat-pump.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-laundry-room-multiple-water-heaters.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-laundry-room.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-laundry-room.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-mechvent-multiple.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-mechvent-multiple.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-mechvent-preconditioning.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-mechvent-preconditioning.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-mechvent.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-mechvent.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-pv.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-pv.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-water-heater-recirc.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-water-heater-recirc.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily-shared-water-heater.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily-shared-water-heater.xml
rename to workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml
diff --git a/workflow/sample_files/base-bldgtype-multifamily.xml b/workflow/sample_files/base-bldgtype-mf-unit.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-multifamily.xml
rename to workflow/sample_files/base-bldgtype-mf-unit.xml
diff --git a/workflow/sample_files/base-bldgtype-attached-2stories.xml b/workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-attached-2stories.xml
rename to workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml
diff --git a/workflow/sample_files/base-bldgtype-attached-atticroof-cathedral.xml b/workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-attached-atticroof-cathedral.xml
rename to workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml
diff --git a/workflow/sample_files/base-bldgtype-attached-infil-compartmentalization-test.xml b/workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-attached-infil-compartmentalization-test.xml
rename to workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml
diff --git a/workflow/sample_files/base-bldgtype-attached.xml b/workflow/sample_files/base-bldgtype-sfa-unit.xml
similarity index 100%
rename from workflow/sample_files/base-bldgtype-attached.xml
rename to workflow/sample_files/base-bldgtype-sfa-unit.xml