diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
index 9f795844e..37c8ec639 100644
--- a/.github/workflows/config.yml
+++ b/.github/workflows/config.yml
@@ -170,12 +170,37 @@ jobs:
runs-on: ubuntu-latest
needs: [run-sample-files1-tests, run-sample-files2-tests, run-real-home-tests, run-other-tests]
steps:
- - name: Merge Artifacts
- uses: actions/upload-artifact/merge@v4
+ - uses: actions/checkout@v4
+ with:
+ ref: ${{ github.head_ref }}
+
+ - name: Download all results
+ uses: actions/download-artifact@v4
with:
- name: results
+ path: test_results
pattern: test_results_*
- delete-merged: true
+ merge-multiple: true
+
+ - name: Delete artifacts
+ uses: geekyeggo/delete-artifact@v5
+ with:
+ name: test_results_*
+
+ - name: Merge results
+ run: |
+ mkdir workflow/tests/test_results
+ cp -r test_results/*.csv workflow/tests/test_results
+ cd workflow/tests
+ pip install pandas
+ python ../../hpxml-measures/workflow/tests/merge.py test_results/sample_files1.csv test_results/sample_files2.csv test_results/sample_files.csv
+ rm test_results/sample_files1.csv
+ rm test_results/sample_files2.csv
+
+ - name: Store results
+ uses: actions/upload-artifact@v4
+ with:
+ path: workflow/tests/test_results
+ name: test_results
compare-results:
if: github.event_name == 'pull_request'
@@ -205,14 +230,14 @@ jobs:
- name: Download feature results
uses: actions/download-artifact@v4
with:
- path: results
- name: results
+ path: test_results
+ name: test_results
- name: Compare results
run: |
cp -r base_results/*.csv workflow/tests/base_results
- mkdir workflow/tests/results
- cp -r results/*.csv workflow/tests/results
+ mkdir workflow/tests/test_results
+ cp -r test_results/*.csv workflow/tests/test_results
pip install numpy
pip install pandas
@@ -239,15 +264,15 @@ jobs:
- name: Download feature results
uses: actions/download-artifact@v4
with:
- path: results
- name: results
+ path: test_results
+ name: test_results
- name: Commit latest results
shell: bash
run: |
branch_name="${{ github.head_ref }}"
git pull origin $branch_name
- cp -r results/*.csv workflow/tests/base_results
+ cp -r test_results/*.csv workflow/tests/base_results
git add workflow/tests/base_results
git status
if [[ $(git diff --cached --exit-code) ]]; then
diff --git a/Changelog.md b/Changelog.md
index cc14ddb82..a8c1d93c3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,17 +9,19 @@ __New Features__
- The `ElectricAuxiliaryEnergy` input for boilers is no longer used.
- **Breaking change**: ERI_Results.csv and ERI_Worksheet.csv combined into a single ERI_Results.csv that better reflects the current ERI calculation components; additional fields (e.g., PEfrac) added and a few renamed/removed.
- **Breaking change**: Each `VentilationFan` must have one (and only one) `UsedFor...` element set to true.
+- HERS software tests:
+ - HERS Hot Water test HPXMLs have been updated to be direct EnergyPlus simulations (like the HERS HVAC & DSE tests already were); they are no longer run through ERI simulations.
+ - HERS HVAC DSE tests now use duct effective R-values instead of nominal insulation R-values to demonstrate that they pass RESNET acceptance criteria.
- Allows optional `Ducts/DuctShape` and `Ducts/DuctFractionRectangular` inputs, which affect duct effective R-value used for modeling.
- Allows `AverageCeilingHeight` to be optionally provided for infiltration calculations.
-- Ground source heat pump model enhancements.
- Allows `Roof/RadiantBarrier` to be omitted; defaults to false.
-- Adds optional `Slab/extension/GapInsulationRValue` input for cases where a slab has horizontal (under slab) insulation.
-- Adds more error-checking for inappropriate inputs (e.g., HVAC SHR=0 or clothes washer IMEF=0).
- Allows `FractionDuctArea` as alternative to `DuctSurfaceArea`
+- Allows alternative `LabelEnergyUse` (W) input for ceiling fans.
+- Allows `Slab/extension/GapInsulationRValue` input for cases where a slab has horizontal (under slab) insulation.
+- Ground source heat pump model enhancements.
- Now defaults to -20F for `CompressorLockoutTemperature` for variable-speed air-to-air heat pumps.
-- Clarifies that Capacity=-1 can be used to autosize HVAC equipment for research purposes or to run tests.
- - It should *not* be used for a real home; a warning will be issued when it's used.
-- Allow alternative label energy use (W) input for ceiling fans.
+- Adds more error-checking for inappropriate inputs (e.g., HVAC SHR=0 or clothes washer IMEF=0).
+- Clarifies that HVAC `Capacity=-1` can be used to autosize HVAC equipment for research purposes or to run tests. It should *not* be used for a real home, and a warning will be issued when it's used.
__Bugfixes__
- Fixes incorrect Reference Home mechanical ventilation flowrate for attached units (when Aext is not 1).
diff --git a/docs/source/testing_framework.rst b/docs/source/testing_framework.rst
index 27ebacfe6..3f5d75f23 100644
--- a/docs/source/testing_framework.rst
+++ b/docs/source/testing_framework.rst
@@ -30,17 +30,16 @@ Or individual tests can be run by specifying the name of the test. A couple exam
| ``openstudio es_zerh_test.rb --name=test_epa``
|
-Test results in CSV format are created at workflow/tests/test_results.
-For many RESNET tests, the Excel spreadsheet test criteria are also implemented in code to automate the process of checking for test failures.
-All simulation/HPXML/etc. files generated from running the tests can be found inside the workflow/tests/test_files directory.
+Test results in CSV format are created at ``workflow/tests/test_results`` and can be used to populate RESNET Excel spreadsheet forms.
+RESNET acceptance criteria are also implemented as part of the tests to check for test failures.
-At the completion of the test, there will also be output that denotes the number of failures/errors like so:
+At the completion of the test, there will be output that denotes the number of failures/errors like so:
``Finished in 36.067116s, 0.0277 runs/s, 0.9704 assertions/s.``
``1 runs, 35 assertions, 0 failures, 0 errors, 0 skips``
Software developers may find it convenient to export HPXML files with the same name as the test files included in the repository.
-This allows issuing the same commands above to generate test results.
+This allows issuing the commands above to generate test results.
Official Test Results
---------------------
diff --git a/hpxml-measures/.github/workflows/config.yml b/hpxml-measures/.github/workflows/config.yml
index b2d3dcf69..8dc9a6fdc 100644
--- a/hpxml-measures/.github/workflows/config.yml
+++ b/hpxml-measures/.github/workflows/config.yml
@@ -46,7 +46,7 @@ jobs:
- name: Store results
uses: actions/upload-artifact@v4
with:
- path: workflow/tests/results
+ path: workflow/tests/test_results
name: results-unit-tests
- name: Build documentation
@@ -85,7 +85,7 @@ jobs:
- name: Store results
uses: actions/upload-artifact@v4
with:
- path: workflow/tests/results
+ path: workflow/tests/test_results
name: results-workflow1-tests
run-workflow2-tests:
@@ -108,7 +108,7 @@ jobs:
- name: Store results
uses: actions/upload-artifact@v4
with:
- path: workflow/tests/results
+ path: workflow/tests/test_results
name: results-workflow2-tests
run-windows-tests:
@@ -130,12 +130,35 @@ jobs:
runs-on: ubuntu-latest
needs: [run-workflow1-tests, run-workflow2-tests, run-unit-tests]
steps:
- - name: Merge Artifacts
- uses: actions/upload-artifact/merge@v4
+ - uses: actions/checkout@v4
with:
- name: results
+ ref: ${{ github.head_ref }}
+
+ - name: Download all results
+ uses: actions/download-artifact@v4
+ with:
+ path: test_results
pattern: results-*
- delete-merged: true
+ merge-multiple: true
+
+ - name: Delete artifacts
+ uses: geekyeggo/delete-artifact@v5
+ with:
+ name: results-*
+
+ - name: Merge results
+ run: |
+ mkdir workflow/tests/test_results
+ cp -r test_results/results* workflow/tests/test_results
+ cd workflow/tests
+ pip install pandas
+ for csv in test_results/*1_*.csv; do csv2="${csv/1_/2_}"; csv_out="${csv/1_/_}"; python merge.py $csv $csv2 $csv_out; rm $csv; rm $csv2; done
+
+ - name: Store results
+ uses: actions/upload-artifact@v4
+ with:
+ path: workflow/tests/test_results
+ name: test_results
compare-results:
if: github.event_name == 'pull_request'
@@ -165,14 +188,14 @@ jobs:
- name: Download feature results
uses: actions/download-artifact@v4
with:
- path: results
- name: results
+ path: test_results
+ name: test_results
- name: Compare results
run: |
cp -r base_results/results*.csv workflow/tests/base_results
- mkdir workflow/tests/results
- cp -r results/results* workflow/tests/results
+ mkdir workflow/tests/test_results
+ cp -r test_results/results* workflow/tests/test_results
pip install numpy
pip install pandas
@@ -199,15 +222,15 @@ jobs:
- name: Download feature results
uses: actions/download-artifact@v4
with:
- path: results
- name: results
+ path: test_results
+ name: test_results
- name: Commit latest results
shell: bash
run: |
branch_name="${{ github.head_ref }}"
git pull origin $branch_name
- cp -r results/results* workflow/tests/base_results
+ cp -r test_results/results* workflow/tests/base_results
git add workflow/tests/base_results
git status
if [[ $(git diff --cached --exit-code) ]]; then
diff --git a/hpxml-measures/.gitignore b/hpxml-measures/.gitignore
index f9f806f53..9a9dd072b 100644
--- a/hpxml-measures/.gitignore
+++ b/hpxml-measures/.gitignore
@@ -1005,7 +1005,7 @@
/workflow/reports
/workflow/out.osw
/workflow/tests/results
-/workflow/tests/run
+/workflow/tests/run*
/workflow/tests/test*
/workflow/sample_files/results
/workflow/sample_files/run*/
diff --git a/hpxml-measures/BuildResidentialHPXML/README.md b/hpxml-measures/BuildResidentialHPXML/README.md
index cbcc8b564..80bc8246f 100644
--- a/hpxml-measures/BuildResidentialHPXML/README.md
+++ b/hpxml-measures/BuildResidentialHPXML/README.md
@@ -1805,7 +1805,7 @@ The output heating capacity of the heating system. If not provided, the OS-HPXML
**Heating System: Heating Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
- **Name:** ``heating_system_heating_autosizing_factor``
- **Type:** ``Double``
@@ -1814,6 +1814,19 @@ The scaling factor applied to the auto-sizing methodology. If not provided, 1.0
+**Heating System: Heating Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+
+- **Name:** ``heating_system_heating_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Heating System: Fraction Heat Load Served**
The heating load served by the heating system.
@@ -1931,7 +1944,7 @@ The output cooling capacity of the cooling system. If not provided, the OS-HPXML
**Cooling System: Cooling Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
- **Name:** ``cooling_system_cooling_autosizing_factor``
- **Type:** ``Double``
@@ -1940,6 +1953,19 @@ The scaling factor applied to the auto-sizing methodology. If not provided, 1.0
+**Cooling System: Cooling Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+
+- **Name:** ``cooling_system_cooling_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Cooling System: Fraction Cool Load Served**
The cooling load served by the cooling system.
@@ -2157,7 +2183,7 @@ The output heating capacity of the heat pump. If not provided, the OS-HPXML auto
**Heat Pump: Heating Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
- **Name:** ``heat_pump_heating_autosizing_factor``
- **Type:** ``Double``
@@ -2166,6 +2192,19 @@ The scaling factor applied to the auto-sizing methodology. If not provided, 1.0
+**Heat Pump: Heating Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+
+- **Name:** ``heat_pump_heating_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Heat Pump: Heating Capacity Retention Fraction**
The output heating capacity of the heat pump at a user-specified temperature (e.g., 17F or 5F) divided by the above nominal heating capacity. Applies to all heat pump types except ground-to-air. If not provided, the OS-HPXML default (see Air-to-Air Heat Pump, Mini-Split Heat Pump, Packaged Terminal Heat Pump, Room Air Conditioner w/ Reverse Cycle) is used.
@@ -2207,7 +2246,7 @@ The output cooling capacity of the heat pump. If not provided, the OS-HPXML auto
**Heat Pump: Cooling Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
- **Name:** ``heat_pump_cooling_autosizing_factor``
- **Type:** ``Double``
@@ -2216,6 +2255,19 @@ The scaling factor applied to the auto-sizing methodology. If not provided, 1.0
+**Heat Pump: Cooling Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+
+- **Name:** ``heat_pump_cooling_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Heat Pump: Fraction Heat Load Served**
The heating load served by the heat pump.
@@ -2270,7 +2322,7 @@ The backup type of the heat pump. If 'integrated', represents e.g. built-in elec
**Heat Pump: Backup Heating Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, 1.0 is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Factor.
+The capacity scaling factor applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, 1.0 is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Factor.
- **Name:** ``heat_pump_backup_heating_autosizing_factor``
- **Type:** ``Double``
@@ -2279,6 +2331,19 @@ The scaling factor applied to the auto-sizing methodology if Backup Type is 'int
+**Heat Pump: Backup Heating Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, no limit is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Limit.
+
+- **Name:** ``heat_pump_backup_heating_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Heat Pump: Backup Fuel Type**
The backup fuel type of the heat pump. Only applies if Backup Type is 'integrated'.
@@ -2712,7 +2777,7 @@ The output heating capacity of the second heating system. If not provided, the O
**Heating System 2: Heating Autosizing Factor**
-The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
- **Name:** ``heating_system_2_heating_autosizing_factor``
- **Type:** ``Double``
@@ -2721,6 +2786,19 @@ The scaling factor applied to the auto-sizing methodology. If not provided, 1.0
+**Heating System 2: Heating Autosizing Limit**
+
+The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+
+- **Name:** ``heating_system_2_heating_autosizing_limit``
+- **Type:** ``Double``
+
+- **Units:** ``Btu/hr``
+
+- **Required:** ``false``
+
+
+
**Heating System 2: Fraction Heat Load Served**
The heat load served fraction of the second heating system. Ignored if this heating system serves as a backup system for a heat pump.
@@ -2800,6 +2878,19 @@ Enter a date like 'Jun 1 - Oct 31'. If not provided, the OS-HPXML default (see <
+**HVAC Blower: Fan Efficiency**
+
+The blower fan efficiency at maximum fan speed. Applies only to split (not packaged) systems (i.e., applies to ducted systems as well as ductless mini-split systems). If not provided, the OS-HPXML default (see HPXML Heating Systems, HPXML Cooling Systems, HPXML Heat Pumps) is used.
+
+- **Name:** ``hvac_blower_fan_watts_per_cfm``
+- **Type:** ``Double``
+
+- **Units:** ``W/CFM``
+
+- **Required:** ``false``
+
+
+
**Ducts: Leakage Units**
The leakage units of the ducts.
diff --git a/hpxml-measures/BuildResidentialHPXML/measure.rb b/hpxml-measures/BuildResidentialHPXML/measure.rb
index e04af4b82..93dbfdc99 100644
--- a/hpxml-measures/BuildResidentialHPXML/measure.rb
+++ b/hpxml-measures/BuildResidentialHPXML/measure.rb
@@ -1127,7 +1127,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_heating_autosizing_factor', false)
arg.setDisplayName('Heating System: Heating Autosizing Factor')
- arg.setDescription('The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ arg.setDescription('The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_heating_autosizing_limit', false)
+ arg.setDisplayName('Heating System: Heating Autosizing Limit')
+ arg.setDescription('The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.')
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_fraction_heat_load_served', true)
@@ -1186,7 +1192,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_autosizing_factor', false)
arg.setDisplayName('Cooling System: Cooling Autosizing Factor')
- arg.setDescription('The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ arg.setDescription('The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_cooling_autosizing_limit', false)
+ arg.setDisplayName('Cooling System: Cooling Autosizing Limit')
+ arg.setDescription('The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.')
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('cooling_system_fraction_cool_load_served', true)
@@ -1325,7 +1337,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_heating_autosizing_factor', false)
arg.setDisplayName('Heat Pump: Heating Autosizing Factor')
- arg.setDescription('The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ arg.setDescription('The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_heating_autosizing_limit', false)
+ arg.setDisplayName('Heat Pump: Heating Autosizing Limit')
+ arg.setDescription('The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.')
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_heating_capacity_retention_fraction', false)
@@ -1348,7 +1366,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_autosizing_factor', false)
arg.setDisplayName('Heat Pump: Cooling Autosizing Factor')
- arg.setDescription('The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ arg.setDescription('The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_cooling_autosizing_limit', false)
+ arg.setDisplayName('Heat Pump: Cooling Autosizing Limit')
+ arg.setDescription('The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.')
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_fraction_heat_load_served', true)
@@ -1379,7 +1403,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_backup_heating_autosizing_factor', false)
arg.setDisplayName('Heat Pump: Backup Heating Autosizing Factor')
- arg.setDescription("The scaling factor applied to the auto-sizing methodology if Backup Type is '#{HPXML::HeatPumpBackupTypeIntegrated}'. If not provided, 1.0 is used. If Backup Type is '#{HPXML::HeatPumpBackupTypeSeparate}', use Heating System 2: Heating Autosizing Factor.")
+ arg.setDescription("The capacity scaling factor applied to the auto-sizing methodology if Backup Type is '#{HPXML::HeatPumpBackupTypeIntegrated}'. If not provided, 1.0 is used. If Backup Type is '#{HPXML::HeatPumpBackupTypeSeparate}', use Heating System 2: Heating Autosizing Factor.")
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heat_pump_backup_heating_autosizing_limit', false)
+ arg.setDisplayName('Heat Pump: Backup Heating Autosizing Limit')
+ arg.setDescription("The maximum capacity limit applied to the auto-sizing methodology if Backup Type is '#{HPXML::HeatPumpBackupTypeIntegrated}'. If not provided, no limit is used. If Backup Type is '#{HPXML::HeatPumpBackupTypeSeparate}', use Heating System 2: Heating Autosizing Limit.")
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeChoiceArgument('heat_pump_backup_fuel', heat_pump_backup_fuel_choices, true)
@@ -1625,7 +1655,13 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_2_heating_autosizing_factor', false)
arg.setDisplayName('Heating System 2: Heating Autosizing Factor')
- arg.setDescription('The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ arg.setDescription('The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.')
+ args << arg
+
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_2_heating_autosizing_limit', false)
+ arg.setDisplayName('Heating System 2: Heating Autosizing Limit')
+ arg.setDescription('The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.')
+ arg.setUnits('Btu/hr')
args << arg
arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('heating_system_2_fraction_heat_load_served', true)
@@ -1669,6 +1705,12 @@ def arguments(model) # rubocop:disable Lint/UnusedMethodArgument
arg.setDescription("Enter a date like 'Jun 1 - Oct 31'. If not provided, the OS-HPXML default (see HPXML HVAC Control) is used. Can also provide '#{HPXML::BuildingAmerica}' to use automatic seasons from the Building America House Simulation Protocols.")
args << arg
+ arg = OpenStudio::Measure::OSArgument::makeDoubleArgument('hvac_blower_fan_watts_per_cfm', false)
+ arg.setDisplayName('HVAC Blower: Fan Efficiency')
+ arg.setDescription("The blower fan efficiency at maximum fan speed. Applies only to split (not packaged) systems (i.e., applies to ducted systems as well as ductless #{HPXML::HVACTypeHeatPumpMiniSplit} systems). If not provided, the OS-HPXML default (see HPXML Heating Systems, HPXML Cooling Systems, HPXML Heat Pumps) is used.")
+ arg.setUnits('W/CFM')
+ args << arg
+
duct_leakage_units_choices = OpenStudio::StringVector.new
duct_leakage_units_choices << HPXML::UnitsCFM25
duct_leakage_units_choices << HPXML::UnitsCFM50
@@ -3742,6 +3784,7 @@ def self.create(runner, model, args, epw_path, hpxml_path, existing_hpxml_path)
set_geothermal_loop(hpxml_bldg, args)
set_secondary_heating_systems(hpxml_bldg, args)
set_hvac_distribution(hpxml_bldg, args)
+ set_hvac_blower(hpxml_bldg, args)
set_hvac_control(hpxml, hpxml_bldg, args, epw_file, weather)
set_ventilation_fans(hpxml_bldg, args)
set_water_heating_systems(hpxml_bldg, args)
@@ -5217,6 +5260,10 @@ def self.set_heating_systems(hpxml_bldg, args)
heating_autosizing_factor = args[:heating_system_heating_autosizing_factor].get
end
+ if args[:heating_system_heating_autosizing_limit].is_initialized
+ heating_autosizing_limit = args[:heating_system_heating_autosizing_limit].get
+ end
+
if [HPXML::HVACTypeElectricResistance].include? heating_system_type
heating_system_fuel = HPXML::FuelTypeElectricity
else
@@ -5264,6 +5311,7 @@ def self.set_heating_systems(hpxml_bldg, args)
heating_system_fuel: heating_system_fuel,
heating_capacity: heating_capacity,
heating_autosizing_factor: heating_autosizing_factor,
+ heating_autosizing_limit: heating_autosizing_limit,
fraction_heat_load_served: fraction_heat_load_served,
heating_efficiency_afue: heating_efficiency_afue,
heating_efficiency_percent: heating_efficiency_percent,
@@ -5288,6 +5336,10 @@ def self.set_cooling_systems(hpxml_bldg, args)
cooling_autosizing_factor = args[:cooling_system_cooling_autosizing_factor].get
end
+ if args[:cooling_system_cooling_autosizing_limit].is_initialized
+ cooling_autosizing_limit = args[:cooling_system_cooling_autosizing_limit].get
+ end
+
if args[:cooling_system_cooling_compressor_type].is_initialized
if [HPXML::HVACTypeCentralAirConditioner, HPXML::HVACTypeMiniSplitAirConditioner].include? cooling_system_type
compressor_type = args[:cooling_system_cooling_compressor_type].get
@@ -5353,6 +5405,7 @@ def self.set_cooling_systems(hpxml_bldg, args)
cooling_system_fuel: HPXML::FuelTypeElectricity,
cooling_capacity: cooling_capacity,
cooling_autosizing_factor: cooling_autosizing_factor,
+ cooling_autosizing_limit: cooling_autosizing_limit,
fraction_cool_load_served: args[:cooling_system_fraction_cool_load_served],
compressor_type: compressor_type,
cooling_shr: cooling_shr,
@@ -5420,6 +5473,10 @@ def self.set_heat_pumps(hpxml_bldg, args)
heating_autosizing_factor = args[:heat_pump_heating_autosizing_factor].get
end
+ if args[:heat_pump_heating_autosizing_limit].is_initialized
+ heating_autosizing_limit = args[:heat_pump_heating_autosizing_limit].get
+ end
+
if args[:heat_pump_heating_capacity_retention_fraction].is_initialized
heating_capacity_retention_fraction = args[:heat_pump_heating_capacity_retention_fraction].get
end
@@ -5432,6 +5489,10 @@ def self.set_heat_pumps(hpxml_bldg, args)
backup_heating_autosizing_factor = args[:heat_pump_backup_heating_autosizing_factor].get
end
+ if args[:heat_pump_backup_heating_autosizing_limit].is_initialized
+ backup_heating_autosizing_limit = args[:heat_pump_backup_heating_autosizing_limit].get
+ end
+
if args[:heat_pump_backup_type] == HPXML::HeatPumpBackupTypeIntegrated
backup_type = args[:heat_pump_backup_type]
backup_heating_fuel = args[:heat_pump_backup_fuel]
@@ -5477,6 +5538,10 @@ def self.set_heat_pumps(hpxml_bldg, args)
cooling_autosizing_factor = args[:heat_pump_cooling_autosizing_factor].get
end
+ if args[:heat_pump_cooling_autosizing_limit].is_initialized
+ cooling_autosizing_limit = args[:heat_pump_cooling_autosizing_limit].get
+ end
+
if args[:heat_pump_cooling_compressor_type].is_initialized
if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit].include? heat_pump_type
compressor_type = args[:heat_pump_cooling_compressor_type].get
@@ -5535,7 +5600,9 @@ def self.set_heat_pumps(hpxml_bldg, args)
heat_pump_fuel: HPXML::FuelTypeElectricity,
heating_capacity: heating_capacity,
heating_autosizing_factor: heating_autosizing_factor,
+ heating_autosizing_limit: heating_autosizing_limit,
backup_heating_autosizing_factor: backup_heating_autosizing_factor,
+ backup_heating_autosizing_limit: backup_heating_autosizing_limit,
heating_capacity_retention_fraction: heating_capacity_retention_fraction,
heating_capacity_retention_temp: heating_capacity_retention_temp,
compressor_type: compressor_type,
@@ -5543,6 +5610,7 @@ def self.set_heat_pumps(hpxml_bldg, args)
cooling_shr: cooling_shr,
cooling_capacity: cooling_capacity,
cooling_autosizing_factor: cooling_autosizing_factor,
+ cooling_autosizing_limit: cooling_autosizing_limit,
fraction_heat_load_served: fraction_heat_load_served,
fraction_cool_load_served: fraction_cool_load_served,
backup_type: backup_type,
@@ -5717,6 +5785,10 @@ def self.set_secondary_heating_systems(hpxml_bldg, args)
heating_autosizing_factor = args[:heating_system_2_heating_autosizing_factor].get
end
+ if args[:heating_system_2_heating_autosizing_limit].is_initialized
+ heating_autosizing_limit = args[:heating_system_2_heating_autosizing_limit].get
+ end
+
if args[:heating_system_2_fuel] == HPXML::HVACTypeElectricResistance
heating_system_fuel = HPXML::FuelTypeElectricity
else
@@ -5742,6 +5814,7 @@ def self.set_secondary_heating_systems(hpxml_bldg, args)
heating_system_fuel: heating_system_fuel,
heating_capacity: heating_capacity,
heating_autosizing_factor: heating_autosizing_factor,
+ heating_autosizing_limit: heating_autosizing_limit,
fraction_heat_load_served: fraction_heat_load_served,
heating_efficiency_afue: heating_efficiency_afue,
heating_efficiency_percent: heating_efficiency_percent)
@@ -5828,6 +5901,31 @@ def self.set_hvac_distribution(hpxml_bldg, args)
end
end
+ def self.set_hvac_blower(hpxml_bldg, args)
+ # Blower fan W/cfm
+ hpxml_bldg.hvac_systems.each do |hvac_system|
+ next unless (!hvac_system.distribution_system.nil? && hvac_system.distribution_system.distribution_system_type == HPXML::HVACDistributionTypeAir) || (hvac_system.is_a?(HPXML::HeatPump) && [HPXML::HVACTypeHeatPumpMiniSplit].include?(hvac_system.heat_pump_type))
+
+ if args[:hvac_blower_fan_watts_per_cfm].is_initialized
+ fan_watts_per_cfm = args[:hvac_blower_fan_watts_per_cfm].get
+ end
+
+ if hvac_system.is_a?(HPXML::HeatingSystem)
+ if [HPXML::HVACTypeFurnace].include?(hvac_system.heating_system_type)
+ hvac_system.fan_watts_per_cfm = fan_watts_per_cfm
+ end
+ elsif hvac_system.is_a?(HPXML::CoolingSystem)
+ if [HPXML::HVACTypeCentralAirConditioner, HPXML::HVACTypeMiniSplitAirConditioner].include?(hvac_system.cooling_system_type)
+ hvac_system.fan_watts_per_cfm = fan_watts_per_cfm
+ end
+ elsif hvac_system.is_a?(HPXML::HeatPump)
+ if [HPXML::HVACTypeHeatPumpAirToAir, HPXML::HVACTypeHeatPumpMiniSplit, HPXML::HVACTypeHeatPumpGroundToAir].include?(hvac_system.heat_pump_type)
+ hvac_system.fan_watts_per_cfm = fan_watts_per_cfm
+ end
+ end
+ end
+ end
+
def self.set_duct_leakages(args, hvac_distribution)
hvac_distribution.duct_leakage_measurements.add(duct_type: HPXML::DuctTypeSupply,
duct_leakage_units: args[:ducts_leakage_units],
@@ -6888,10 +6986,14 @@ def self.set_refrigerator(hpxml_bldg, args)
usage_multiplier = args[:refrigerator_usage_multiplier].get
end
+ if args[:extra_refrigerator_present]
+ primary_indicator = true
+ end
+
hpxml_bldg.refrigerators.add(id: "Refrigerator#{hpxml_bldg.refrigerators.size + 1}",
location: location,
rated_annual_kwh: rated_annual_kwh,
- primary_indicator: true,
+ primary_indicator: primary_indicator,
usage_multiplier: usage_multiplier)
end
diff --git a/hpxml-measures/BuildResidentialHPXML/measure.xml b/hpxml-measures/BuildResidentialHPXML/measure.xml
index 3663a603d..5071352c3 100644
--- a/hpxml-measures/BuildResidentialHPXML/measure.xml
+++ b/hpxml-measures/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
3.1
build_residential_hpxml
a13a8983-2b01-4930-8af2-42030b6e4233
- c3c0c169-df40-4201-8c40-2491d3c416d2
- 2024-04-23T23:55:38Z
+ b782d66b-066c-47f5-90db-b397e3392d3e
+ 2024-04-29T21:40:42Z
2C38F48B
BuildResidentialHPXML
HPXML Builder
@@ -2324,11 +2324,20 @@
heating_system_heating_autosizing_factor
Heating System: Heating Autosizing Factor
- The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
Double
false
false
+
+ heating_system_heating_autosizing_limit
+ Heating System: Heating Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+ Double
+ Btu/hr
+ false
+ false
+
heating_system_fraction_heat_load_served
Heating System: Fraction Heat Load Served
@@ -2471,11 +2480,20 @@
cooling_system_cooling_autosizing_factor
Cooling System: Cooling Autosizing Factor
- The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
Double
false
false
+
+ cooling_system_cooling_autosizing_limit
+ Cooling System: Cooling Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+ Double
+ Btu/hr
+ false
+ false
+
cooling_system_fraction_cool_load_served
Cooling System: Fraction Cool Load Served
@@ -2743,8 +2761,17 @@
heat_pump_heating_autosizing_factor
Heat Pump: Heating Autosizing Factor
- The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ Double
+ false
+ false
+
+
+ heat_pump_heating_autosizing_limit
+ Heat Pump: Heating Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
Double
+ Btu/hr
false
false
@@ -2778,11 +2805,20 @@
heat_pump_cooling_autosizing_factor
Heat Pump: Cooling Autosizing Factor
- The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
Double
false
false
+
+ heat_pump_cooling_autosizing_limit
+ Heat Pump: Cooling Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
+ Double
+ Btu/hr
+ false
+ false
+
heat_pump_fraction_heat_load_served
Heat Pump: Fraction Heat Load Served
@@ -2838,8 +2874,17 @@
heat_pump_backup_heating_autosizing_factor
Heat Pump: Backup Heating Autosizing Factor
- The scaling factor applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, 1.0 is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Factor.
+ The capacity scaling factor applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, 1.0 is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Factor.
+ Double
+ false
+ false
+
+
+ heat_pump_backup_heating_autosizing_limit
+ Heat Pump: Backup Heating Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology if Backup Type is 'integrated'. If not provided, no limit is used. If Backup Type is 'separate', use Heating System 2: Heating Autosizing Limit.
Double
+ Btu/hr
false
false
@@ -3355,8 +3400,17 @@
heating_system_2_heating_autosizing_factor
Heating System 2: Heating Autosizing Factor
- The scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ The capacity scaling factor applied to the auto-sizing methodology. If not provided, 1.0 is used.
+ Double
+ false
+ false
+
+
+ heating_system_2_heating_autosizing_limit
+ Heating System 2: Heating Autosizing Limit
+ The maximum capacity limit applied to the auto-sizing methodology. If not provided, no limit is used.
Double
+ Btu/hr
false
false
@@ -3422,6 +3476,15 @@
false
false
+
+ hvac_blower_fan_watts_per_cfm
+ HVAC Blower: Fan Efficiency
+ The blower fan efficiency at maximum fan speed. Applies only to split (not packaged) systems (i.e., applies to ducted systems as well as ductless mini-split systems). If not provided, the OS-HPXML default (see <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heating-systems'>HPXML Heating Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-cooling-systems'>HPXML Cooling Systems</a>, <a href='https://openstudio-hpxml.readthedocs.io/en/v1.7.0/workflow_inputs.html#hpxml-heat-pumps'>HPXML Heat Pumps</a>) is used.
+ Double
+ W/CFM
+ false
+ false
+
ducts_leakage_units
Ducts: Leakage Units
@@ -7262,7 +7325,7 @@
README.md
md
readme
- DBA0E5FD
+ 54A95546
README.md.erb
@@ -7279,7 +7342,7 @@
measure.rb
rb
script
- 90280349
+ A4FCB77B
geometry.rb
diff --git a/hpxml-measures/Changelog.md b/hpxml-measures/Changelog.md
index c2ec6dd86..85a64c342 100644
--- a/hpxml-measures/Changelog.md
+++ b/hpxml-measures/Changelog.md
@@ -2,6 +2,7 @@
__New Features__
- Updates to HPXML v4.0-rc4.
+- Adds BPI-2400 HPXML test files and results; see [Testing Framework](https://openstudio-hpxml.readthedocs.io/en/latest/testing_framework.html) for more information.
- Updates per ANSI/RESNET/ICC 301-2022 w/ Addendum C:
- **Breaking change**: Replaces `WaterHeatingSystem/NumberofUnitsServed` with `WaterHeatingSystem/extension/NumberofBedroomsServed` for apportioning shared water heater tank losses.
- **Breaking change**: Replaces `HotWaterDistribution/extension/SharedRecirculation/NumberofUnitsServed` with `HotWaterDistribution/extension/SharedRecirculation/NumberofBedroomsServed` for apportioning shared recirculation pump energy.
@@ -32,7 +33,8 @@ __New Features__
- Updates to using G-Functions from the [G-Function Library for Modeling Vertical Bore Ground Heat Exchanger](https://gdr.openei.org/submissions/1325).
- Updated heating/cooling performance curves to reflect newer equipment.
- Allows optional `Ducts/DuctShape` and `Ducts/DuctFractionRectangular` inputs, which affect duct effective R-value used for modeling.
-- Allows optional `HeatingAutosizingFactor`, `CoolingAutosizingFactor`, `BackupHeatingAutosizingFactor` inputs to scale HVAC equipment autosizing results.
+- Allows optional `HeatingAutosizingFactor`, `CoolingAutosizingFactor`, `BackupHeatingAutosizingFactor` inputs to scale HVAC capacities for autosized equipment.
+- Allows optional `HeatingAutosizingLimit`, `CoolingAutosizingLimit`, `BackupHeatingAutosizingLimit` inputs to set maximum HVAC capacities ceiling for autosized equipment.
- Adds optional `Slab/extension/GapInsulationRValue` input for cases where a slab has horizontal (under slab) insulation.
- Allows radiant barriers for additional locations (attic gable walls and floor); reduced emissivity due to dust assumed for radiant barriers on attic floor.
- Adds window and skylight `GlassType` options of "low-e, high-solar-gain" and "low-e, low-solar-gain"; updates U-factor/SHGC lookup tables.
@@ -44,6 +46,7 @@ __New Features__
- Adds heat pump backup sizing methodology input.
- Add soil and moisture type arguments (for determining ground conductivity and diffusivity) and optional geothermal loop arguments for ground source heat pumps.
- The "Geometry: Building Number of Units" input is now written to the HPXML `NumberofUnitsInBuilding` element.
+ - Adds a blower fan efficiency input for specifying fan power W/cfm at maximum speed.
- Manual J design load calculations:
- Allow additional outdoor design condition inputs: `DailyTemperatureRange` and `HumidityDifference`.
- Miscellaneous improvements.
diff --git a/hpxml-measures/HPXMLtoOpenStudio/measure.xml b/hpxml-measures/HPXMLtoOpenStudio/measure.xml
index 5c98aa10a..b9dd628bb 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/measure.xml
+++ b/hpxml-measures/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.1
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- a62520d4-0a3f-41c1-92fe-1cc1ffcc1938
- 2024-04-23T23:55:40Z
+ b55edf04-941c-413c-bb54-af96ee6e3aac
+ 2024-04-29T21:40:45Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -304,7 +304,7 @@
hpxml.rb
rb
resource
- 75F7BCC5
+ 6B0D03F0
hpxml_defaults.rb
@@ -328,7 +328,7 @@
hpxml_schematron/EPvalidator.xml
xml
resource
- 93C62D66
+ 2DB8CF14
hpxml_schematron/iso-schematron.xsd
@@ -346,7 +346,7 @@
hvac_sizing.rb
rb
resource
- 7BEC5537
+ 88CFBA04
lighting.rb
@@ -598,7 +598,7 @@
test_defaults.rb
rb
test
- 68C938E6
+ D1E090FE
test_enclosure.rb
@@ -628,7 +628,7 @@
test_hvac_sizing.rb
rb
test
- 89AEE4D3
+ A88A7DC3
test_lighting.rb
@@ -670,7 +670,7 @@
test_validation.rb
rb
test
- F781C8D3
+ 782CDD67
test_water_heater.rb
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
index b40f064b7..5e3686e11 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml.rb
@@ -4280,7 +4280,7 @@ def initialize(hpxml_object, *args)
:third_party_certification, :htg_seed_id, :is_shared_system, :number_of_units_served,
:shared_loop_watts, :shared_loop_motor_efficiency, :fan_coil_watts, :fan_watts_per_cfm,
:airflow_defect_ratio, :fan_watts, :heating_airflow_cfm, :location, :primary_system,
- :pilot_light, :pilot_light_btuh, :electric_resistance_distribution, :heating_autosizing_factor]
+ :pilot_light, :pilot_light_btuh, :electric_resistance_distribution, :heating_autosizing_factor, :heating_autosizing_limit]
attr_accessor(*ATTRS)
attr_reader(:heating_detailed_performance_data)
@@ -4406,6 +4406,7 @@ def to_doc(building)
XMLHelper.add_extension(heating_system, 'AirflowDefectRatio', @airflow_defect_ratio, :float, @airflow_defect_ratio_isdefaulted) unless @airflow_defect_ratio.nil?
XMLHelper.add_extension(heating_system, 'HeatingAirflowCFM', @heating_airflow_cfm, :float, @heating_airflow_cfm_isdefaulted) unless @heating_airflow_cfm.nil?
XMLHelper.add_extension(heating_system, 'HeatingAutosizingFactor', @heating_autosizing_factor, :float, @heating_autosizing_factor_isdefaulted) unless @heating_autosizing_factor.nil?
+ XMLHelper.add_extension(heating_system, 'HeatingAutosizingLimit', @heating_autosizing_limit, :float, @heating_autosizing_limit_isdefaulted) unless @heating_autosizing_limit.nil?
XMLHelper.add_extension(heating_system, 'HeatingSeedId', @htg_seed_id, :string) unless @htg_seed_id.nil?
if @primary_system
primary_heating_system = XMLHelper.insert_element(primary_systems, 'PrimaryHeatingSystem')
@@ -4446,6 +4447,7 @@ def from_doc(heating_system)
@airflow_defect_ratio = XMLHelper.get_value(heating_system, 'extension/AirflowDefectRatio', :float)
@heating_airflow_cfm = XMLHelper.get_value(heating_system, 'extension/HeatingAirflowCFM', :float)
@heating_autosizing_factor = XMLHelper.get_value(heating_system, 'extension/HeatingAutosizingFactor', :float)
+ @heating_autosizing_limit = XMLHelper.get_value(heating_system, 'extension/HeatingAutosizingLimit', :float)
@htg_seed_id = XMLHelper.get_value(heating_system, 'extension/HeatingSeedId', :string)
primary_heating_system = HPXML::get_idref(XMLHelper.get_element(heating_system, '../PrimarySystems/PrimaryHeatingSystem'))
if primary_heating_system == @id
@@ -4491,7 +4493,7 @@ def initialize(hpxml_object, *args)
:fan_watts_per_cfm, :charge_defect_ratio, :cooling_airflow_cfm, :location, :primary_system,
:integrated_heating_system_fuel, :integrated_heating_system_capacity, :integrated_heating_system_efficiency_percent,
:integrated_heating_system_fraction_heat_load_served, :integrated_heating_system_airflow_cfm, :htg_seed_id, :crankcase_heater_watts,
- :cooling_autosizing_factor]
+ :cooling_autosizing_factor, :cooling_autosizing_limit]
attr_accessor(*ATTRS)
attr_reader(:cooling_detailed_performance_data)
@@ -4608,6 +4610,7 @@ def to_doc(building)
XMLHelper.add_extension(cooling_system, 'FanCoilWatts', @fan_coil_watts, :float) unless @fan_coil_watts.nil?
XMLHelper.add_extension(cooling_system, 'CrankcaseHeaterPowerWatts', @crankcase_heater_watts, :float, @crankcase_heater_watts_isdefaulted) unless @crankcase_heater_watts.nil?
XMLHelper.add_extension(cooling_system, 'CoolingAutosizingFactor', @cooling_autosizing_factor, :float, @cooling_autosizing_factor_isdefaulted) unless @cooling_autosizing_factor.nil?
+ XMLHelper.add_extension(cooling_system, 'CoolingAutosizingLimit', @cooling_autosizing_limit, :float, @cooling_autosizing_limit_isdefaulted) unless @cooling_autosizing_limit.nil?
XMLHelper.add_extension(cooling_system, 'CoolingSeedId', @clg_seed_id, :string) unless @clg_seed_id.nil?
XMLHelper.add_extension(cooling_system, 'HeatingSeedId', @htg_seed_id, :string) unless @htg_seed_id.nil?
if @primary_system
@@ -4652,6 +4655,7 @@ def from_doc(cooling_system)
@fan_coil_watts = XMLHelper.get_value(cooling_system, 'extension/FanCoilWatts', :float)
@crankcase_heater_watts = XMLHelper.get_value(cooling_system, 'extension/CrankcaseHeaterPowerWatts', :float)
@cooling_autosizing_factor = XMLHelper.get_value(cooling_system, 'extension/CoolingAutosizingFactor', :float)
+ @cooling_autosizing_limit = XMLHelper.get_value(cooling_system, 'extension/CoolingAutosizingLimit', :float)
@clg_seed_id = XMLHelper.get_value(cooling_system, 'extension/CoolingSeedId', :string)
@htg_seed_id = XMLHelper.get_value(cooling_system, 'extension/HeatingSeedId', :string)
primary_cooling_system = HPXML::get_idref(XMLHelper.get_element(cooling_system, '../PrimarySystems/PrimaryCoolingSystem'))
@@ -4807,7 +4811,8 @@ def initialize(hpxml_object, *args)
:shared_loop_motor_efficiency, :airflow_defect_ratio, :charge_defect_ratio,
:heating_airflow_cfm, :cooling_airflow_cfm, :location, :primary_heating_system, :primary_cooling_system,
:heating_capacity_retention_fraction, :heating_capacity_retention_temp, :crankcase_heater_watts,
- :geothermal_loop_idref, :cooling_autosizing_factor, :heating_autosizing_factor, :backup_heating_autosizing_factor]
+ :geothermal_loop_idref, :cooling_autosizing_factor, :heating_autosizing_factor, :backup_heating_autosizing_factor,
+ :cooling_autosizing_limit, :heating_autosizing_limit, :backup_heating_autosizing_limit]
attr_accessor(*ATTRS)
attr_reader(:cooling_detailed_performance_data)
attr_reader(:heating_detailed_performance_data)
@@ -4989,6 +4994,9 @@ def to_doc(building)
XMLHelper.add_extension(heat_pump, 'CoolingAutosizingFactor', @cooling_autosizing_factor, :float, @cooling_autosizing_factor_isdefaulted) unless @cooling_autosizing_factor.nil?
XMLHelper.add_extension(heat_pump, 'HeatingAutosizingFactor', @heating_autosizing_factor, :float, @heating_autosizing_factor_isdefaulted) unless @heating_autosizing_factor.nil?
XMLHelper.add_extension(heat_pump, 'BackupHeatingAutosizingFactor', @backup_heating_autosizing_factor, :float, @backup_heating_autosizing_factor_isdefaulted) unless @backup_heating_autosizing_factor.nil?
+ XMLHelper.add_extension(heat_pump, 'CoolingAutosizingLimit', @cooling_autosizing_limit, :float, @cooling_autosizing_limit_isdefaulted) unless @cooling_autosizing_limit.nil?
+ XMLHelper.add_extension(heat_pump, 'HeatingAutosizingLimit', @heating_autosizing_limit, :float, @heating_autosizing_limit_isdefaulted) unless @heating_autosizing_limit.nil?
+ XMLHelper.add_extension(heat_pump, 'BackupHeatingAutosizingLimit', @backup_heating_autosizing_limit, :float, @backup_heating_autosizing_limit_isdefaulted) unless @backup_heating_autosizing_limit.nil?
XMLHelper.add_extension(heat_pump, 'HeatingSeedId', @htg_seed_id, :string) unless @htg_seed_id.nil?
XMLHelper.add_extension(heat_pump, 'CoolingSeedId', @clg_seed_id, :string) unless @clg_seed_id.nil?
if @primary_heating_system
@@ -5053,6 +5061,9 @@ def from_doc(heat_pump)
@cooling_autosizing_factor = XMLHelper.get_value(heat_pump, 'extension/CoolingAutosizingFactor', :float)
@heating_autosizing_factor = XMLHelper.get_value(heat_pump, 'extension/HeatingAutosizingFactor', :float)
@backup_heating_autosizing_factor = XMLHelper.get_value(heat_pump, 'extension/BackupHeatingAutosizingFactor', :float)
+ @cooling_autosizing_limit = XMLHelper.get_value(heat_pump, 'extension/CoolingAutosizingLimit', :float)
+ @heating_autosizing_limit = XMLHelper.get_value(heat_pump, 'extension/HeatingAutosizingLimit', :float)
+ @backup_heating_autosizing_limit = XMLHelper.get_value(heat_pump, 'extension/BackupHeatingAutosizingLimit', :float)
@htg_seed_id = XMLHelper.get_value(heat_pump, 'extension/HeatingSeedId', :string)
@clg_seed_id = XMLHelper.get_value(heat_pump, 'extension/CoolingSeedId', :string)
primary_heating_system = HPXML::get_idref(XMLHelper.get_element(heat_pump, '../PrimarySystems/PrimaryHeatingSystem'))
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
index c3e30c210..b80c8797c 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hpxml_schematron/EPvalidator.xml
@@ -821,6 +821,8 @@
Expected 1 element(s) for xpath: HeatingSystemType[ElectricResistance | Furnace | WallFurnace | FloorFurnace | Boiler | Stove | SpaceHeater | Fireplace]
Expected 0 or 1 element(s) for xpath: extension/HeatingAutosizingFactor
HeatingAutosizingFactor should be greater than 0.0
+ Expected 0 or 1 element(s) for xpath: extension/HeatingAutosizingLimit
+ HeatingAutosizingLimit should be greater than 0.0
@@ -1026,7 +1028,7 @@
Expected 0 or 1 element(s) for xpath: extension/PilotLightBtuh
-
+
[CoolingSystem]
@@ -1035,6 +1037,8 @@
Expected CoolingSystemType to be 'central air conditioner' or 'room air conditioner' or 'evaporative cooler' or 'mini-split' or 'chiller' or 'cooling tower' or 'packaged terminal air conditioner'
Expected 0 or 1 element(s) for xpath: extension/CoolingAutosizingFactor
CoolingAutosizingFactor should be greater than 0.0
+ Expected 0 or 1 element(s) for xpath: extension/CoolingAutosizingLimit
+ CoolingAutosizingLimit should be greater than 0.0
@@ -1223,6 +1227,10 @@
Expected 0 or 1 element(s) for xpath: extension/HeatingAutosizingFactor
CoolingAutosizingFactor should be greater than 0.0
HeatingAutosizingFactor should be greater than 0.0
+ Expected 0 or 1 element(s) for xpath: extension/CoolingAutosizingLimit
+ Expected 0 or 1 element(s) for xpath: extension/HeatingAutosizingLimit
+ CoolingAutosizingLimit should be greater than 0.0
+ HeatingAutosizingLimit should be greater than 0.0
@@ -1406,7 +1414,7 @@
Cooling capacity should typically be greater than or equal to 1000 Btu/hr.
-
+
[HeatPumpCapacityRetention]
@@ -1441,6 +1449,8 @@
Expected 0 or 1 element(s) for xpath: BackupHeatingCapacity
Expected 0 or 1 element(s) for xpath: extension/BackupHeatingAutosizingFactor
BackupHeatingAutosizingFactor should be greater than 0.0
+ Expected 0 or 1 element(s) for xpath: extension/BackupHeatingAutosizingLimit
+ BackupHeatingAutosizingLimit should be greater than 0.0
Percent efficiency should typically be greater than or equal to 0.5.
AFUE should typically be greater than or equal to 0.5.
@@ -1458,6 +1468,7 @@
Expected 0 element(s) for xpath: BackupAnnualHeatingEfficiency
Expected 0 element(s) for xpath: BackupHeatingCapacity
Expected 0 element(s) for xpath: extension/BackupHeatingAutosizingFactor
+ Expected 0 element(s) for xpath: extension/BackupHeatingAutosizingLimit
diff --git a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
index 473145e6c..337470f5a 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/resources/hvac_sizing.rb
@@ -46,7 +46,7 @@ def self.calculate(runner, weather, hpxml_bldg, cfa, hvac_systems, update_hpxml:
apply_hvac_heat_pump_logic(hvac_sizing_values, hvac_cooling, frac_heat_load_served, frac_cool_load_served)
apply_hvac_equipment_adjustments(mj, runner, hvac_sizing_values, weather, hvac_heating, hvac_cooling, hvac_system)
apply_hvac_installation_quality(mj, hvac_sizing_values, hvac_heating, hvac_cooling, frac_heat_load_served, frac_cool_load_served)
- apply_hvac_autosizing_factors(hvac_sizing_values, hvac_heating, hvac_cooling)
+ apply_hvac_autosizing_factors_and_limits(hvac_sizing_values, hvac_heating, hvac_cooling)
apply_hvac_fixed_capacities(hvac_sizing_values, hvac_heating, hvac_cooling)
apply_hvac_ground_loop(mj, runner, hvac_sizing_values, weather, hvac_cooling)
apply_hvac_finalize_airflows(hvac_sizing_values, hvac_heating, hvac_cooling)
@@ -1898,18 +1898,39 @@ def self.apply_hvac_installation_quality(mj, hvac_sizing_values, hvac_heating, h
end
end
- def self.apply_hvac_autosizing_factors(hvac_sizing_values, hvac_heating, hvac_cooling)
+ def self.apply_hvac_autosizing_factors_and_limits(hvac_sizing_values, hvac_heating, hvac_cooling)
if not hvac_cooling.nil?
- hvac_sizing_values.Cool_Capacity *= hvac_cooling.cooling_autosizing_factor
- hvac_sizing_values.Cool_Airflow *= hvac_cooling.cooling_autosizing_factor
- hvac_sizing_values.Cool_Capacity_Sens *= hvac_cooling.cooling_autosizing_factor
+ cooling_autosizing_limit = hvac_cooling.cooling_autosizing_limit
+ if cooling_autosizing_limit.nil?
+ cooling_autosizing_limit = 1 / Constants.small
+ end
+
+ cooling_autosizing_factor = [hvac_cooling.cooling_autosizing_factor, cooling_autosizing_limit / hvac_sizing_values.Cool_Capacity].min
+
+ hvac_sizing_values.Cool_Capacity *= cooling_autosizing_factor
+ hvac_sizing_values.Cool_Airflow *= cooling_autosizing_factor
+ hvac_sizing_values.Cool_Capacity_Sens *= cooling_autosizing_factor
end
if not hvac_heating.nil?
- hvac_sizing_values.Heat_Capacity *= hvac_heating.heating_autosizing_factor
- hvac_sizing_values.Heat_Airflow *= hvac_heating.heating_autosizing_factor
+ heating_autosizing_limit = hvac_heating.heating_autosizing_limit
+ if heating_autosizing_limit.nil?
+ heating_autosizing_limit = 1 / Constants.small
+ end
+
+ heating_autosizing_factor = [hvac_heating.heating_autosizing_factor, heating_autosizing_limit / hvac_sizing_values.Heat_Capacity].min
+
+ hvac_sizing_values.Heat_Capacity *= heating_autosizing_factor
+ hvac_sizing_values.Heat_Airflow *= heating_autosizing_factor
end
if (hvac_cooling.is_a? HPXML::HeatPump) && (hvac_cooling.backup_type == HPXML::HeatPumpBackupTypeIntegrated)
- hvac_sizing_values.Heat_Capacity_Supp *= hvac_cooling.backup_heating_autosizing_factor
+ backup_heating_autosizing_limit = hvac_cooling.backup_heating_autosizing_limit
+ if backup_heating_autosizing_limit.nil?
+ backup_heating_autosizing_limit = 1 / Constants.small
+ end
+
+ backup_heating_autosizing_factor = [hvac_cooling.backup_heating_autosizing_factor, backup_heating_autosizing_limit / hvac_sizing_values.Heat_Capacity_Supp].min
+
+ hvac_sizing_values.Heat_Capacity_Supp *= backup_heating_autosizing_factor
end
end
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
index 63604d8b3..744dc0246 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_defaults.rb
@@ -1178,21 +1178,21 @@ def test_central_air_conditioners
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, 12345, 12.0, 40.0, 1.0)
+ _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, -0.11, -0.22, 12345, 12.0, 40.0, 1.0)
# Test defaults - SEER2
hpxml_bldg.cooling_systems[0].cooling_efficiency_seer = nil
hpxml_bldg.cooling_systems[0].cooling_efficiency_seer2 = 11.4
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, 12345, 12.0, 40.0, 1.0)
+ _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, -0.11, -0.22, 12345, 12.0, 40.0, 1.0)
# Test autosizing with factors
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, nil, 12.0, 40.0, 1.2)
+ _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, -0.11, -0.22, nil, 12.0, 40.0, 1.2)
# Test defaults
hpxml_bldg.cooling_systems[0].cooling_shr = nil
@@ -1202,10 +1202,11 @@ def test_central_air_conditioners
hpxml_bldg.cooling_systems[0].airflow_defect_ratio = nil
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = nil
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = nil
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, HPXML::HVACCompressorTypeSingleStage, 0.5, 0, 0, nil, 12.0, 50.0, 1.0)
+ _test_default_central_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, HPXML::HVACCompressorTypeSingleStage, 0.5, nil, 0, 0, nil, 12.0, 50.0, 1.0)
end
def test_room_air_conditioners
@@ -1216,23 +1217,24 @@ def test_room_air_conditioners
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.88, 12345, 40.0, 1.0)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.88, nil, 12345, 40.0, 1.0)
# Test autosizing with factors
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.88, nil, 40.0, 1.2)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.88, nil, nil, 40.0, 1.2)
# Test defaults
hpxml_bldg.cooling_systems[0].cooling_shr = nil
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = nil
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.65, nil, 0.0, 1.0)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.65, nil, nil, 0.0, 1.0)
end
def test_evaporative_coolers
@@ -1241,21 +1243,22 @@ def test_evaporative_coolers
hpxml_bldg.cooling_systems[0].cooling_capacity = 12345
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], 12345, 1.0)
+ _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], nil, 12345, 1.0)
# Test autosizing with factors
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], nil, 1.2)
+ _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], nil, nil, 1.2)
# Test defaults
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = nil
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], nil, 1.0)
+ _test_default_evap_cooler_values(default_hpxml_bldg.cooling_systems[0], nil, nil, 1.0)
end
def test_mini_split_air_conditioners
@@ -1270,14 +1273,14 @@ def test_mini_split_air_conditioners
hpxml_bldg.cooling_systems[0].compressor_type = HPXML::HVACCompressorTypeVariableSpeed
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.78, 0.66, -0.11, -0.22, 12345, 19.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
+ _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.78, 0.66, nil, -0.11, -0.22, 12345, 19.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
# Test autosizing with factors
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.78, 0.66, -0.11, -0.22, nil, 19.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.2)
+ _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.78, 0.66, nil, -0.11, -0.22, nil, 19.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.2)
# Test defaults
hpxml_bldg.cooling_systems[0].cooling_shr = nil
@@ -1288,22 +1291,23 @@ def test_mini_split_air_conditioners
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = nil
hpxml_bldg.cooling_systems[0].compressor_type = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = nil
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.18, 0, 0, nil, 19.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
+ _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.18, nil, 0, 0, nil, 19.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
# Test defaults w/ ductless
hpxml_bldg.cooling_systems[0].distribution_system.delete
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.07, 0, 0, nil, 19.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
+ _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.07, nil, 0, 0, nil, 19.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
# Test defaults w/ ductless - SEER2
hpxml_bldg.cooling_systems[0].cooling_efficiency_seer = nil
hpxml_bldg.cooling_systems[0].cooling_efficiency_seer2 = 13.3
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.07, 0, 0, nil, 13.3, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
+ _test_default_mini_split_air_conditioner_values(default_hpxml_bldg.cooling_systems[0], 0.73, 0.07, nil, 0, 0, nil, 13.3, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0)
end
def test_ptac
@@ -1314,23 +1318,24 @@ def test_ptac
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.75, 12345, 40.0, 1.0)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.75, nil, 12345, 40.0, 1.0)
# Test autosizing with factors
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.75, nil, 40.0, 1.2)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.75, nil, nil, 40.0, 1.2)
# Test defaults
hpxml_bldg.cooling_systems[0].cooling_shr = nil
hpxml_bldg.cooling_systems[0].cooling_capacity = nil
hpxml_bldg.cooling_systems[0].crankcase_heater_watts = nil
hpxml_bldg.cooling_systems[0].cooling_autosizing_factor = nil
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.65, nil, 0.0, 1.0)
+ _test_default_room_air_conditioner_ptac_values(default_hpxml_bldg.cooling_systems[0], 0.65, nil, nil, 0.0, 1.0)
end
def test_furnaces
@@ -1343,14 +1348,14 @@ def test_furnaces
hpxml_bldg.heating_systems[0].pilot_light_btuh = 999
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.66, -0.22, 12345, true, 999, 1.0)
+ _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.66, nil, -0.22, 12345, true, 999, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.66, -0.22, nil, true, 999, 1.2)
+ _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.66, nil, -0.22, nil, true, 999, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts_per_cfm = nil
@@ -1358,15 +1363,16 @@ def test_furnaces
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].pilot_light_btuh = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.375, 0, nil, true, 500, 1.0)
+ _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.375, nil, 0, nil, true, 500, 1.0)
# Test defaults w/o pilot
hpxml_bldg.heating_systems[0].pilot_light = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.375, 0, nil, false, nil, 1.0)
+ _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.375, nil, 0, nil, false, nil, 1.0)
# Test defaults w/ gravity distribution system
hpxml, hpxml_bldg = _create_hpxml('base-hvac-furnace-gas-only.xml')
@@ -1376,7 +1382,7 @@ def test_furnaces
hpxml_bldg.heating_systems[0].heating_capacity = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.0, 0, nil, false, nil, 1.0)
+ _test_default_furnace_values(default_hpxml_bldg.heating_systems[0], 0.0, nil, 0, nil, false, nil, 1.0)
end
def test_wall_furnaces
@@ -1386,27 +1392,29 @@ def test_wall_furnaces
hpxml_bldg.heating_systems[0].heating_capacity = 12345
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 22, 12345, 1.0)
+ _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, 12345, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, 1.2)
+ _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, nil, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts = nil
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, 1.0)
+ _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, nil, 1.0)
# Test defaults w/o pilot
+ hpxml_bldg.heating_systems[0].pilot_light = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, 1.0)
+ _test_default_wall_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, nil, 1.0)
end
def test_floor_furnaces
@@ -1418,28 +1426,29 @@ def test_floor_furnaces
hpxml_bldg.heating_systems[0].pilot_light_btuh = 999
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 22, 12345, true, 999, 1.0)
+ _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, 12345, true, 999, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, true, 999, 1.2)
+ _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 22, nil, nil, true, 999, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts = nil
hpxml_bldg.heating_systems[0].pilot_light_btuh = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, true, 500, 1.0)
+ _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 0, 706, nil, true, 500, 1.0)
# Test defaults w/o pilot
hpxml_bldg.heating_systems[0].pilot_light = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 0, nil, false, nil, 1.0)
+ _test_default_floor_furnace_values(default_hpxml_bldg.heating_systems[0], 0, 706, nil, false, nil, 1.0)
end
def test_electric_resistance
@@ -1480,6 +1489,7 @@ def test_boilers
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].pilot_light_btuh = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
_test_default_boiler_values(default_hpxml_bldg.heating_systems[0], 170.0, nil, true, 500, 1.0)
@@ -1502,29 +1512,29 @@ def test_stoves
hpxml_bldg.heating_systems[0].pilot_light_btuh = 999
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 22, 12345, true, 999, 1.0)
+ _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 22, nil, 12345, true, 999, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 22, nil, true, 999, 1.2)
+ _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 22, nil, nil, true, 999, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts = nil
- hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].pilot_light_btuh = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 40, nil, true, 500, 1.0)
+ _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 40, nil, nil, true, 500, 1.0)
# Test defaults w/o pilot
hpxml_bldg.heating_systems[0].pilot_light = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 40, nil, false, nil, 1.0)
+ _test_default_stove_values(default_hpxml_bldg.heating_systems[0], 40, nil, nil, false, nil, 1.0)
end
def test_space_heaters
@@ -1534,22 +1544,23 @@ def test_space_heaters
hpxml_bldg.heating_systems[0].heating_capacity = 12345
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 22, 12345, 1.0)
+ _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 22, nil, 12345, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 22, nil, 1.2)
+ _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 22, nil, nil, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts = nil
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 0, nil, 1.0)
+ _test_default_portable_heater_values(default_hpxml_bldg.heating_systems[0], 0, nil, nil, 1.0)
end
def test_fireplaces
@@ -1561,29 +1572,30 @@ def test_fireplaces
hpxml_bldg.heating_systems[0].pilot_light_btuh = 999
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 22, 12345, true, 999, 1.0)
+ _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 22, nil, 12345, true, 999, 1.0)
# Test autosizing with factors
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 22, nil, true, 999, 1.2)
+ _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 22, nil, nil, true, 999, 1.2)
# Test defaults
hpxml_bldg.heating_systems[0].fan_watts = nil
hpxml_bldg.heating_systems[0].heating_capacity = nil
hpxml_bldg.heating_systems[0].pilot_light_btuh = nil
hpxml_bldg.heating_systems[0].heating_autosizing_factor = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 0, nil, true, 500, 1.0)
+ _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 0, nil, nil, true, 500, 1.0)
# Test defaults w/o pilot
hpxml_bldg.heating_systems[0].pilot_light = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 0, nil, false, nil, 1.0)
+ _test_default_fireplace_values(default_hpxml_bldg.heating_systems[0], 0, nil, nil, false, nil, 1.0)
end
def test_air_source_heat_pumps
@@ -1604,7 +1616,7 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, 12345, 23456, nil, 34567, 14.0, 8.0, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, 12345, 23456, nil, 34567, 14.0, 8.0, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
# Test w/ heating capacity 17F
hpxml_bldg.heat_pumps[0].heating_capacity_17F = 9876
@@ -1612,7 +1624,7 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, 12345, 23456, 9876, 34567, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, 12345, 23456, 9876, 34567, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
# Test defaults - SEER2/HSPF2
hpxml_bldg.heat_pumps[0].cooling_efficiency_seer = nil
@@ -1621,7 +1633,7 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].heating_efficiency_hspf2 = 6.8
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, 12345, 23456, 9876, 34567, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, 12345, 23456, 9876, 34567, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
# Test autosizing with factors
hpxml_bldg.heat_pumps[0].cooling_capacity = nil
@@ -1633,7 +1645,7 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = 1.1
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, 0.528, 5.0, 40.0, 1.5, 1.2, 1.1)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, 0.528, 5.0, 40.0, 1.5, 1.2, 1.1)
# Test defaults
hpxml_bldg.heat_pumps[0].cooling_shr = nil
@@ -1649,9 +1661,12 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, HPXML::HVACCompressorTypeSingleStage, 0.5, 0, 0, nil, nil, nil, nil, 14.0, 8.0, 0.425, 5.0, 50.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, HPXML::HVACCompressorTypeSingleStage, 0.5, nil, nil, 0, 0, nil, nil, nil, nil, 14.0, 8.0, 0.425, 5.0, 50.0, 1.0, 1.0, 1.0)
# Test w/ detailed performance data
hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml')
@@ -1666,7 +1681,7 @@ def test_air_source_heat_pumps
hpxml_bldg.heat_pumps[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
hpxml_bldg.heat_pumps[0].heating_capacity_retention_fraction = nil
hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = nil
@@ -1674,12 +1689,12 @@ def test_air_source_heat_pumps
max_cap_at_47f = hpxml_bldg.heat_pumps[0].heating_detailed_performance_data.find { |dp| dp.outdoor_temperature == 47.0 && dp.capacity_description == HPXML::CapacityDescriptionMaximum }.capacity
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, (max_cap_at_5f / max_cap_at_47f).round(5), 5.0, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, nil, nil, nil, nil, 14.0, 8.0, (max_cap_at_5f / max_cap_at_47f).round(5), 5.0, 40.0, 1.0, 1.0, 1.0)
hpxml_bldg.heat_pumps[0].heating_capacity_17F = 9876
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, -0.11, -0.22, nil, nil, 9876, nil, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
+ _test_default_air_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.88, HPXML::HVACCompressorTypeVariableSpeed, 0.66, nil, nil, -0.11, -0.22, nil, nil, 9876, nil, 14.0, 8.0, nil, nil, 40.0, 1.0, 1.0, 1.0)
# Test w/ detailed performance data and autosizing
heating_capacity_fractions = [0.35, 1.0, 0.2, 0.75, 0.1, 0.65]
@@ -1722,7 +1737,7 @@ def test_pthp
hpxml_bldg.heat_pumps[0].crankcase_heater_watts = 40.0
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, 12345, 23456, nil, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
+ _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, nil, nil, 12345, 23456, nil, 0.1, 2.0, 40.0, 1.0, 1.0, 1.0)
# Test w/ heating capacity 17F
hpxml_bldg.heat_pumps[0].heating_capacity_17F = 9876
@@ -1730,19 +1745,18 @@ def test_pthp
hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, 12345, 23456, 9876, nil, nil, 40.0, 1.0, 1.0, 1.0)
+ _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, nil, nil, 12345, 23456, 9876, nil, nil, 40.0, 1.0, 1.0, 1.0)
# Test autosizing with factors
hpxml_bldg.heat_pumps[0].cooling_capacity = nil
hpxml_bldg.heat_pumps[0].heating_capacity = nil
hpxml_bldg.heat_pumps[0].heating_capacity_17F = nil
- hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = 1.5
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = 1.2
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = 1.1
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, nil, nil, nil, 0.425, 5.0, 40.0, 1.5, 1.2, 1.1)
+ _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.88, nil, nil, nil, nil, nil, 0.425, 5.0, 40.0, 1.5, 1.2, 1.1)
# Test defaults
hpxml_bldg.heat_pumps[0].cooling_shr = nil
@@ -1754,9 +1768,12 @@ def test_pthp
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.65, nil, nil, nil, 0.425, 5.0, 0.0, 1.0, 1.0, 1.0)
+ _test_default_pthp_values(default_hpxml_bldg.heat_pumps[0], 0.65, nil, nil, nil, nil, nil, 0.425, 5.0, 0.0, 1.0, 1.0, 1.0)
end
def test_mini_split_heat_pumps
@@ -1775,7 +1792,7 @@ def test_mini_split_heat_pumps
hpxml_bldg.heat_pumps[0].compressor_type = HPXML::HVACCompressorTypeVariableSpeed
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, -0.11, -0.22, 12345, 23456, nil, 34567, 19.0, 10.0, 0.1, 2.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, nil, nil, -0.11, -0.22, 12345, 23456, nil, 34567, 19.0, 10.0, 0.1, 2.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
# Test w/ heating capacity 17F
hpxml_bldg.heat_pumps[0].heating_capacity_17F = 9876
@@ -1783,7 +1800,7 @@ def test_mini_split_heat_pumps
hpxml_bldg.heat_pumps[0].heating_capacity_retention_temp = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, -0.11, -0.22, 12345, 23456, 9876, 34567, 19.0, 10.0, nil, nil, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, nil, nil, -0.11, -0.22, 12345, 23456, 9876, 34567, 19.0, 10.0, nil, nil, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
# Test autosizing with factors
hpxml_bldg.heat_pumps[0].cooling_capacity = nil
@@ -1795,7 +1812,7 @@ def test_mini_split_heat_pumps
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = 1.1
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, -0.11, -0.22, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.5, 1.2, 1.1)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.78, 0.66, nil, nil, -0.11, -0.22, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 40.0, HPXML::HVACCompressorTypeVariableSpeed, 1.5, 1.2, 1.1)
# Test defaults
hpxml_bldg.heat_pumps[0].cooling_shr = nil
@@ -1811,24 +1828,27 @@ def test_mini_split_heat_pumps
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = nil
hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = nil
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_limit = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.18, 0, 0, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.18, nil, nil, 0, 0, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
# Test defaults w/ ductless and no backup
hpxml_bldg.heat_pumps[0].distribution_system.delete
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.07, 0, 0, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.07, nil, nil, 0, 0, nil, nil, nil, nil, 19.0, 10.0, 0.62, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
- # Test defaults w/ ductless - SEER2/HSPF2
+ # Test defaults - SEER2/HSPF2
hpxml_bldg.heat_pumps[0].cooling_efficiency_seer = nil
hpxml_bldg.heat_pumps[0].cooling_efficiency_seer2 = 13.3
hpxml_bldg.heat_pumps[0].heating_efficiency_hspf = nil
hpxml_bldg.heat_pumps[0].heating_efficiency_hspf2 = 6.8
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.07, 0, 0, nil, nil, nil, nil, 13.3, 7.56, 0.51, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
+ _test_default_mini_split_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 0.73, 0.07, nil, nil, 0, 0, nil, nil, nil, nil, 13.3, 7.56, 0.51, 5.0, 50.0, HPXML::HVACCompressorTypeVariableSpeed, 1.0, 1.0, 1.0)
end
def test_heat_pump_temperatures
@@ -1928,7 +1948,7 @@ def test_ground_source_heat_pumps
hpxml_bldg.heat_pumps[0].backup_heating_capacity = 34567
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_ground_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 9.9, 0.66, -0.22, 12345, 23456, 34567)
+ _test_default_ground_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 9.9, 0.66, nil, nil, -0.22, 12345, 23456, 34567)
# Test defaults
hpxml_bldg.heat_pumps[0].pump_watts_per_ton = nil
@@ -1939,7 +1959,7 @@ def test_ground_source_heat_pumps
hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_default_hpxml, default_hpxml_bldg = _test_measure()
- _test_default_ground_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 30.0, 0.375, 0, nil, nil, nil)
+ _test_default_ground_to_air_heat_pump_values(default_hpxml_bldg.heat_pumps[0], 30.0, 0.375, nil, nil, 0, nil, nil, nil)
end
def test_geothermal_loops
@@ -4449,11 +4469,16 @@ def _test_default_furniture_mass_values(furniture_mass, area_fraction, type)
assert_equal(type, furniture_mass.type)
end
- def _test_default_central_air_conditioner_values(cooling_system, shr, compressor_type, fan_watts_per_cfm, charge_defect_ratio,
+ def _test_default_central_air_conditioner_values(cooling_system, shr, compressor_type, fan_watts_per_cfm, cooling_airflow_cfm, charge_defect_ratio,
airflow_defect_ratio, cooling_capacity, cooling_efficiency_seer, crankcase_heater_watts, cooling_autosizing_factor)
assert_equal(shr, cooling_system.cooling_shr)
assert_equal(compressor_type, cooling_system.compressor_type)
assert_equal(fan_watts_per_cfm, cooling_system.fan_watts_per_cfm)
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(cooling_system.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, cooling_system.cooling_airflow_cfm, 1.0)
+ end
assert_equal(charge_defect_ratio, cooling_system.charge_defect_ratio)
assert_equal(airflow_defect_ratio, cooling_system.airflow_defect_ratio)
assert_equal(crankcase_heater_watts, cooling_system.crankcase_heater_watts)
@@ -4470,8 +4495,13 @@ def _test_default_central_air_conditioner_values(cooling_system, shr, compressor
end
end
- def _test_default_room_air_conditioner_ptac_values(cooling_system, shr, cooling_capacity, crankcase_heater_watts, cooling_autosizing_factor)
+ def _test_default_room_air_conditioner_ptac_values(cooling_system, shr, cooling_airflow_cfm, cooling_capacity, crankcase_heater_watts, cooling_autosizing_factor)
assert_equal(shr, cooling_system.cooling_shr)
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(cooling_system.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, cooling_system.cooling_airflow_cfm, 1.0)
+ end
assert_equal(crankcase_heater_watts, cooling_system.crankcase_heater_watts)
assert_equal(cooling_autosizing_factor, cooling_system.cooling_autosizing_factor)
if cooling_capacity.nil?
@@ -4481,7 +4511,12 @@ def _test_default_room_air_conditioner_ptac_values(cooling_system, shr, cooling_
end
end
- def _test_default_evap_cooler_values(cooling_system, cooling_capacity, cooling_autosizing_factor)
+ def _test_default_evap_cooler_values(cooling_system, cooling_airflow_cfm, cooling_capacity, cooling_autosizing_factor)
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(cooling_system.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, cooling_system.cooling_airflow_cfm, 1.0)
+ end
assert_equal(cooling_autosizing_factor, cooling_system.cooling_autosizing_factor)
if cooling_capacity.nil?
assert(cooling_system.cooling_capacity > 0)
@@ -4490,10 +4525,15 @@ def _test_default_evap_cooler_values(cooling_system, cooling_capacity, cooling_a
end
end
- def _test_default_mini_split_air_conditioner_values(cooling_system, shr, fan_watts_per_cfm, charge_defect_ratio, airflow_defect_ratio,
+ def _test_default_mini_split_air_conditioner_values(cooling_system, shr, fan_watts_per_cfm, cooling_airflow_cfm, charge_defect_ratio, airflow_defect_ratio,
cooling_capacity, cooling_efficiency_seer, crankcase_heater_watts, compressor_type, cooling_autosizing_factor)
assert_equal(shr, cooling_system.cooling_shr)
assert_equal(fan_watts_per_cfm, cooling_system.fan_watts_per_cfm)
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(cooling_system.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, cooling_system.cooling_airflow_cfm, 1.0)
+ end
assert_equal(charge_defect_ratio, cooling_system.charge_defect_ratio)
assert_equal(airflow_defect_ratio, cooling_system.airflow_defect_ratio)
assert_equal(crankcase_heater_watts, cooling_system.crankcase_heater_watts)
@@ -4511,9 +4551,14 @@ def _test_default_mini_split_air_conditioner_values(cooling_system, shr, fan_wat
assert_equal(compressor_type, cooling_system.compressor_type)
end
- def _test_default_furnace_values(heating_system, fan_watts_per_cfm, airflow_defect_ratio, heating_capacity,
+ def _test_default_furnace_values(heating_system, fan_watts_per_cfm, heating_airflow_cfm, airflow_defect_ratio, heating_capacity,
pilot_light, pilot_light_btuh, heating_autosizing_factor)
assert_equal(fan_watts_per_cfm, heating_system.fan_watts_per_cfm)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(airflow_defect_ratio, heating_system.airflow_defect_ratio)
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
@@ -4529,8 +4574,13 @@ def _test_default_furnace_values(heating_system, fan_watts_per_cfm, airflow_defe
end
end
- def _test_default_wall_furnace_values(heating_system, fan_watts, heating_capacity, heating_autosizing_factor)
+ def _test_default_wall_furnace_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity, heating_autosizing_factor)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
@@ -4539,8 +4589,13 @@ def _test_default_wall_furnace_values(heating_system, fan_watts, heating_capacit
end
end
- def _test_default_floor_furnace_values(heating_system, fan_watts, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
+ def _test_default_floor_furnace_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
@@ -4575,8 +4630,13 @@ def _test_default_boiler_values(heating_system, eae, heating_capacity, pilot_lig
end
end
- def _test_default_stove_values(heating_system, fan_watts, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
+ def _test_default_stove_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
@@ -4591,8 +4651,13 @@ def _test_default_stove_values(heating_system, fan_watts, heating_capacity, pilo
end
end
- def _test_default_portable_heater_values(heating_system, fan_watts, heating_capacity, heating_autosizing_factor)
+ def _test_default_portable_heater_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity, heating_autosizing_factor)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
@@ -4601,8 +4666,13 @@ def _test_default_portable_heater_values(heating_system, fan_watts, heating_capa
end
end
- def _test_default_fixed_heater_values(heating_system, fan_watts, heating_capacity)
+ def _test_default_fixed_heater_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_equal(heating_airflow_cfm, heating_system.heating_airflow_cfm)
+ end
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
else
@@ -4610,8 +4680,13 @@ def _test_default_fixed_heater_values(heating_system, fan_watts, heating_capacit
end
end
- def _test_default_fireplace_values(heating_system, fan_watts, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
+ def _test_default_fireplace_values(heating_system, fan_watts, heating_airflow_cfm, heating_capacity, pilot_light, pilot_light_btuh, heating_autosizing_factor)
assert_equal(fan_watts, heating_system.fan_watts)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heating_system.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heating_system.heating_airflow_cfm, 1.0)
+ end
assert_equal(heating_autosizing_factor, heating_system.heating_autosizing_factor)
if heating_capacity.nil?
assert(heating_system.heating_capacity > 0)
@@ -4626,8 +4701,10 @@ def _test_default_fireplace_values(heating_system, fan_watts, heating_capacity,
end
end
- def _test_default_air_to_air_heat_pump_values(heat_pump, shr, compressor_type, fan_watts_per_cfm, charge_defect_ratio,
- airflow_defect_ratio, cooling_capacity, heating_capacity,
+ def _test_default_air_to_air_heat_pump_values(heat_pump, shr, compressor_type, fan_watts_per_cfm,
+ cooling_airflow_cfm, heating_airflow_cfm,
+ charge_defect_ratio, airflow_defect_ratio,
+ cooling_capacity, heating_capacity,
heating_capacity_17F, backup_heating_capacity,
cooling_efficiency_seer, heating_efficiency_hspf,
heating_capacity_retention_fraction, heating_capacity_retention_temp,
@@ -4636,6 +4713,16 @@ def _test_default_air_to_air_heat_pump_values(heat_pump, shr, compressor_type, f
assert_equal(shr, heat_pump.cooling_shr)
assert_equal(compressor_type, heat_pump.compressor_type)
assert_equal(fan_watts_per_cfm, heat_pump.fan_watts_per_cfm)
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, heat_pump.cooling_airflow_cfm, 1.0)
+ end
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heat_pump.heating_airflow_cfm, 1.0)
+ end
assert_equal(charge_defect_ratio, heat_pump.charge_defect_ratio)
assert_equal(airflow_defect_ratio, heat_pump.airflow_defect_ratio)
assert_equal(crankcase_heater_watts, heat_pump.crankcase_heater_watts)
@@ -4707,11 +4794,21 @@ def _test_default_detailed_performance_capacities(heat_pump, heating_nominal_cap
end
end
- def _test_default_pthp_values(heat_pump, shr, cooling_capacity, heating_capacity, heating_capacity_17F,
+ def _test_default_pthp_values(heat_pump, shr, heating_airflow_cfm, cooling_airflow_cfm, cooling_capacity, heating_capacity, heating_capacity_17F,
heating_capacity_retention_fraction, heating_capacity_retention_temp,
crankcase_heater_watts, heating_autosizing_factor, cooling_autosizing_factor,
backup_heating_autosizing_factor)
assert_equal(shr, heat_pump.cooling_shr)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heat_pump.heating_airflow_cfm, 1.0)
+ end
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, heat_pump.cooling_airflow_cfm, 1.0)
+ end
assert_equal(crankcase_heater_watts, heat_pump.crankcase_heater_watts)
assert_equal(heating_autosizing_factor, heat_pump.heating_autosizing_factor)
assert_equal(cooling_autosizing_factor, heat_pump.cooling_autosizing_factor)
@@ -4743,7 +4840,7 @@ def _test_default_pthp_values(heat_pump, shr, cooling_capacity, heating_capacity
end
end
- def _test_default_mini_split_heat_pump_values(heat_pump, shr, fan_watts_per_cfm, charge_defect_ratio,
+ def _test_default_mini_split_heat_pump_values(heat_pump, shr, fan_watts_per_cfm, heating_airflow_cfm, cooling_airflow_cfm, charge_defect_ratio,
airflow_defect_ratio, cooling_capacity, heating_capacity,
heating_capacity_17F, backup_heating_capacity,
cooling_efficiency_seer, heating_efficiency_hspf,
@@ -4752,6 +4849,16 @@ def _test_default_mini_split_heat_pump_values(heat_pump, shr, fan_watts_per_cfm,
cooling_autosizing_factor, backup_heating_autosizing_factor)
assert_equal(shr, heat_pump.cooling_shr)
assert_equal(fan_watts_per_cfm, heat_pump.fan_watts_per_cfm)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.heating_airflow_cfm > 0)
+ else
+ assert_in_delta(heating_airflow_cfm, heat_pump.heating_airflow_cfm, 1.0)
+ end
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.cooling_airflow_cfm > 0)
+ else
+ assert_in_delta(cooling_airflow_cfm, heat_pump.cooling_airflow_cfm, 1.0)
+ end
assert_equal(charge_defect_ratio, heat_pump.charge_defect_ratio)
assert_equal(airflow_defect_ratio, heat_pump.airflow_defect_ratio)
assert_equal(crankcase_heater_watts, heat_pump.crankcase_heater_watts)
@@ -4820,11 +4927,21 @@ def _test_default_heat_pump_temperature_values(heat_pump, compressor_lockout_tem
end
end
- def _test_default_ground_to_air_heat_pump_values(heat_pump, pump_watts_per_ton, fan_watts_per_cfm,
+ def _test_default_ground_to_air_heat_pump_values(heat_pump, pump_watts_per_ton, fan_watts_per_cfm, heating_airflow_cfm, cooling_airflow_cfm,
airflow_defect_ratio, cooling_capacity, heating_capacity,
backup_heating_capacity)
assert_equal(pump_watts_per_ton, heat_pump.pump_watts_per_ton)
assert_equal(fan_watts_per_cfm, heat_pump.fan_watts_per_cfm)
+ if heating_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.heating_airflow_cfm > 0)
+ else
+ assert_equal(heating_airflow_cfm, heat_pump.heating_airflow_cfm)
+ end
+ if cooling_airflow_cfm.nil? # nil implies an autosized value
+ assert(heat_pump.cooling_airflow_cfm > 0)
+ else
+ assert_equal(cooling_airflow_cfm, heat_pump.cooling_airflow_cfm)
+ end
assert_equal(airflow_defect_ratio, heat_pump.airflow_defect_ratio)
if cooling_capacity.nil?
assert(heat_pump.cooling_capacity > 0)
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
index e2284e60f..3b4c3d03b 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_hvac_sizing.rb
@@ -13,7 +13,7 @@ def setup
@sample_files_path = File.join(@root_path, 'workflow', 'sample_files')
@test_files_path = File.join(@root_path, 'workflow', 'tests')
@tmp_hpxml_path = File.join(@sample_files_path, 'tmp.xml')
- @results_dir = File.join(@test_files_path, 'results')
+ @results_dir = File.join(@test_files_path, 'test_results')
FileUtils.mkdir_p @results_dir
end
@@ -630,6 +630,8 @@ def test_autosizing_factors
args_hash = {}
args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+ bhaf = 2.0 - haf # use a reverse factor for backup heating sizing
+
# Test air conditioner + furnace
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.heating_systems[0].heating_capacity = nil
@@ -665,13 +667,12 @@ def test_autosizing_factors
hpxml_bldg.heat_pumps[0].heating_capacity = nil
hpxml_bldg.heat_pumps[0].cooling_capacity = nil
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = haf
- # use a reverse factor for backup heating sizing
- hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = (2.0 - haf)
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = bhaf
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = caf
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_model, _hpxml, hpxml_bldg = _test_measure(args_hash)
assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig * haf, 0.001)
- assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig * (2.0 - haf), 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig * bhaf, 0.001)
assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig * caf, 0.001)
# Test heat pump w/ detailed performance
@@ -689,15 +690,38 @@ def test_autosizing_factors
hpxml_bldg.heat_pumps[0].cooling_capacity = nil
hpxml_bldg.heat_pumps[0].heating_autosizing_factor = haf
hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = caf
- # use a reverse factor for backup heating sizing
- hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = (2.0 - haf)
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_factor = bhaf
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig * haf, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig * bhaf, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig * caf, 0.001)
+
+ # Test heat pump with separate backup heating
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ htg_cap_orig = hpxml_bldg.heat_pumps[0].heating_capacity
+ clg_cap_orig = hpxml_bldg.heat_pumps[0].cooling_capacity
+ backup_htg_cap_orig = hpxml_bldg.heating_systems[0].heating_capacity
+ # apply autosizing factor
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_factor = haf
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = caf
+ hpxml_bldg.heating_systems[0].heating_autosizing_factor = bhaf
XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
_model, _hpxml, hpxml_bldg = _test_measure(args_hash)
assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig * haf, 0.001)
- assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig * (2.0 - haf), 0.001)
+ assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, backup_htg_cap_orig * bhaf, 0.001)
assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig * caf, 0.001)
- # Test allow fixed capacity
+ # Test allow increased fixed capacity
hpxml, hpxml_bldg = _create_hpxml('base-hvac-undersized.xml')
hpxml_bldg.header.allow_increased_fixed_capacities = true
# apply autosizing factor
@@ -711,31 +735,144 @@ def test_autosizing_factors
assert_operator(hpxml_bldg.cooling_systems[0].cooling_capacity, :>, clg_cap)
end
end
+ end
- # Test heat pump with separate back up heating
- hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
- hpxml_bldg.heat_pumps[0].heating_capacity = nil
- hpxml_bldg.heat_pumps[0].cooling_capacity = nil
- hpxml_bldg.heating_systems[0].heating_capacity = nil
- XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
- _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
- htg_cap_orig = hpxml_bldg.heat_pumps[0].heating_capacity
- clg_cap_orig = hpxml_bldg.heat_pumps[0].cooling_capacity
- backup_htg_cap_orig = hpxml_bldg.heating_systems[0].heating_capacity
- # apply autosizing factor
- hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
- hpxml_bldg.heat_pumps[0].heating_capacity = nil
- hpxml_bldg.heat_pumps[0].cooling_capacity = nil
- hpxml_bldg.heating_systems[0].heating_capacity = nil
- # use a reverse factor for backup heating sizing
- hpxml_bldg.heat_pumps[0].heating_autosizing_factor = 0.8
- hpxml_bldg.heat_pumps[0].cooling_autosizing_factor = 1.5
- hpxml_bldg.heating_systems[0].heating_autosizing_factor = 1.2
- XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
- _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
- assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig * 0.8, 0.001)
- assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, backup_htg_cap_orig * 1.2, 0.001)
- assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig * 1.5, 0.001)
+ def test_autosizing_limits
+ clg_autosizing_limits = { true => 1000, false => 100000 }
+ htg_autosizing_limits = { true => 1200, false => 120000 }
+ for clg_limit, cal in clg_autosizing_limits
+ for htg_limit, hal in htg_autosizing_limits
+ args_hash = {}
+ args_hash['hpxml_path'] = File.absolute_path(@tmp_hpxml_path)
+
+ bhal = hal + 500.0 # use a similar limit for backup heating sizing
+
+ # Test air conditioner + furnace
+ hpxml, hpxml_bldg = _create_hpxml('base.xml')
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ hpxml_bldg.cooling_systems[0].cooling_capacity = nil
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ htg_cap_orig = hpxml_bldg.heating_systems[0].heating_capacity
+ clg_cap_orig = hpxml_bldg.cooling_systems[0].cooling_capacity
+ # apply autosizing limit
+ hpxml, hpxml_bldg = _create_hpxml('base.xml')
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ hpxml_bldg.cooling_systems[0].cooling_capacity = nil
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = hal
+ hpxml_bldg.cooling_systems[0].cooling_autosizing_limit = cal
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ if htg_limit
+ assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, hal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, htg_cap_orig, 0.001)
+ end
+ if clg_limit
+ assert_in_epsilon(hpxml_bldg.cooling_systems[0].cooling_capacity, cal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.cooling_systems[0].cooling_capacity, clg_cap_orig, 0.001)
+ end
+
+ # Test heat pump
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+ hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ htg_cap_orig = hpxml_bldg.heat_pumps[0].heating_capacity
+ clg_cap_orig = hpxml_bldg.heat_pumps[0].cooling_capacity
+ backup_htg_cap_orig = hpxml_bldg.heat_pumps[0].backup_heating_capacity
+ # apply autosizing limit
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-1-speed.xml')
+ hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = hal
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_limit = bhal
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = cal
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ if htg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, hal, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, bhal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig, 0.001)
+ end
+ if clg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, cal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig, 0.001)
+ end
+
+ # Test heat pump w/ detailed performance
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml')
+ hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ htg_cap_orig = hpxml_bldg.heat_pumps[0].heating_capacity
+ clg_cap_orig = hpxml_bldg.heat_pumps[0].cooling_capacity
+ backup_htg_cap_orig = hpxml_bldg.heat_pumps[0].backup_heating_capacity
+ # apply autosizing limit
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml')
+ hpxml_bldg.heat_pumps[0].backup_heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = hal
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = cal
+ hpxml_bldg.heat_pumps[0].backup_heating_autosizing_limit = bhal
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ if htg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, hal, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, bhal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig, 0.001)
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].backup_heating_capacity, backup_htg_cap_orig, 0.001)
+ end
+ if clg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, cal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig, 0.001)
+ end
+
+ # Test heat pump with separate backup heating
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ htg_cap_orig = hpxml_bldg.heat_pumps[0].heating_capacity
+ clg_cap_orig = hpxml_bldg.heat_pumps[0].cooling_capacity
+ backup_htg_cap_orig = hpxml_bldg.heating_systems[0].heating_capacity
+ # apply autosizing factor
+ hpxml, hpxml_bldg = _create_hpxml('base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml')
+ hpxml_bldg.heat_pumps[0].heating_capacity = nil
+ hpxml_bldg.heat_pumps[0].cooling_capacity = nil
+ hpxml_bldg.heating_systems[0].heating_capacity = nil
+ # use a reverse factor for backup heating sizing
+ hpxml_bldg.heat_pumps[0].heating_autosizing_limit = hal
+ hpxml_bldg.heat_pumps[0].cooling_autosizing_limit = cal
+ hpxml_bldg.heating_systems[0].heating_autosizing_limit = bhal
+ XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path)
+ _model, _hpxml, hpxml_bldg = _test_measure(args_hash)
+ if htg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, hal, 0.001)
+ assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, bhal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].heating_capacity, htg_cap_orig, 0.001)
+ assert_in_epsilon(hpxml_bldg.heating_systems[0].heating_capacity, backup_htg_cap_orig, 0.001)
+ end
+ if clg_limit
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, cal, 0.001)
+ else
+ assert_in_epsilon(hpxml_bldg.heat_pumps[0].cooling_capacity, clg_cap_orig, 0.001)
+ end
+ end
+ end
end
def test_manual_j_detailed_sizing_inputs
diff --git a/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb b/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
index 05c9ad776..4a95a05c6 100644
--- a/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
+++ b/hpxml-measures/HPXMLtoOpenStudio/tests/test_validation.rb
@@ -1670,6 +1670,7 @@ def test_ruby_warning_messages
hpxml, hpxml_bldg = _create_hpxml('base.xml')
hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-stochastic.csv')
hpxml_bldg.header.schedules_filepaths << File.join(File.dirname(__FILE__), '../resources/schedule_files/occupancy-non-stochastic.csv')
+ hpxml_bldg.refrigerators[0].primary_indicator = true
hpxml_bldg.refrigerators[0].constant_coefficients = '-0.487, -0.340, -0.370, -0.361, -0.515, -0.684, -0.471, -0.159, -0.079, -0.417, -0.411, -0.386, -0.240, -0.314, -0.160, -0.121, -0.469, -0.412, -0.091, 0.077, -0.118, -0.247, -0.445, -0.544'
hpxml_bldg.refrigerators[0].temperature_coefficients = '0.019, 0.016, 0.017, 0.016, 0.018, 0.021, 0.019, 0.015, 0.015, 0.019, 0.018, 0.018, 0.016, 0.017, 0.015, 0.015, 0.020, 0.020, 0.017, 0.014, 0.016, 0.017, 0.019, 0.020'
hpxml_bldg.refrigerators.add(id: "Refrigerator#{hpxml_bldg.refrigerators.size + 1}",
diff --git a/hpxml-measures/docs/source/index.rst b/hpxml-measures/docs/source/index.rst
index cecae8084..1596ff2f5 100644
--- a/hpxml-measures/docs/source/index.rst
+++ b/hpxml-measures/docs/source/index.rst
@@ -14,6 +14,7 @@ OpenStudio-HPXML documentation
usage_instructions
workflow_inputs
workflow_outputs
+ testing_framework.rst
Indices and tables
==================
diff --git a/hpxml-measures/docs/source/testing_framework.rst b/hpxml-measures/docs/source/testing_framework.rst
new file mode 100644
index 000000000..103845eb4
--- /dev/null
+++ b/hpxml-measures/docs/source/testing_framework.rst
@@ -0,0 +1,49 @@
+Testing Framework
+=================
+
+A large number of tests are automatically run for every code change in the GitHub repository.
+
+The current set of tests include:
+
+- Successful simulations for all sample files
+- ASHRAE 140
+- RESNET® HERS® HVAC tests
+- RESNET HERS DSE tests
+- RESNET HERS Hot Water tests
+
+OpenStudio-HPXML can be used to meet BPI-2400 software tests.
+
+Running Tests Locally
+---------------------
+
+All ASHRAE 140 tests can be run using:
+
+| ``openstudio test_ashrae_140.rb``
+|
+
+All RESNET HERS tests can be run using:
+
+| ``openstudio test_hers.rb``
+|
+
+Or individual tests can be run by specifying the name of the test. For example:
+
+| ``openstudio test_hers.rb --name=test_hers_hvac``
+|
+
+Test results in CSV format are created at ``workflow/tests/test_results`` and can be used to populate RESNET Excel spreadsheet forms.
+RESNET acceptance criteria are also implemented as part of the tests to check for test failures.
+
+At the completion of the test, there will be output that denotes the number of failures/errors like so:
+
+``Finished in 36.067116s, 0.0277 runs/s, 0.9704 assertions/s.``
+``1 runs, 35 assertions, 0 failures, 0 errors, 0 skips``
+
+Software developers may find it convenient to export HPXML files with the same name as the test files included in the repository.
+This allows issuing the commands above to generate test results.
+
+Official Test Results
+---------------------
+
+The official OpenStudio-HPXML test results can be found in any release or any checkout of the code at ``workflow/tests/base_results``.
+The results are based on using the HPXML files found under ``workflow/tests``.
diff --git a/hpxml-measures/docs/source/workflow_inputs.rst b/hpxml-measures/docs/source/workflow_inputs.rst
index 5a312c790..baa8c6042 100644
--- a/hpxml-measures/docs/source/workflow_inputs.rst
+++ b/hpxml-measures/docs/source/workflow_inputs.rst
@@ -1632,7 +1632,8 @@ Each electric resistance heating system is entered as a ``/HPXML/Building/Buildi
``HeatingCapacity`` double Btu/hr >= 0 No autosized [#]_ Heating output capacity
``AnnualHeatingEfficiency[Units="Percent"]/Value`` double frac > 0, <= 1 Yes Efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
============================================================= ======= ====== ================== ======== ============== ==========
.. [#] ElectricDistribution choices are "baseboard", "radiant floor", or "radiant ceiling".
@@ -1663,7 +1664,8 @@ Each central furnace is entered as a ``/HPXML/Building/BuildingDetails/Systems/H
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWattsPerCFM`` double W/cfm >= 0 No See [#]_ Blower fan efficiency at maximum fan speed [#]_
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
====================================================== ======= ========= =============== ======== ============== ================================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -1703,7 +1705,8 @@ Each wall furnace is entered as a ``/HPXML/Building/BuildingDetails/Systems/HVAC
``AnnualHeatingEfficiency[Units="AFUE"]/Value`` double frac > 0, <= 1 Yes Rated efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWatts`` double W >= 0 No 0 Fan power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
========================================================== ======= ====== =============== ======== ============== ================
.. [#] HeatingSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
@@ -1731,7 +1734,8 @@ Each floor furnace is entered as a ``/HPXML/Building/BuildingDetails/Systems/HVA
``AnnualHeatingEfficiency[Units="AFUE"]/Value`` double frac > 0, <= 1 Yes Rated efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWatts`` double W >= 0 No 0 Fan power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
=========================================================== ======= ====== =============== ======== ============== ================
.. [#] HeatingSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
@@ -1761,7 +1765,8 @@ Each in-unit boiler is entered as a ``/HPXML/Building/BuildingDetails/Systems/HV
``AnnualHeatingEfficiency[Units="AFUE"]/Value`` double frac > 0, <= 1 Yes Rated efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``ElectricAuxiliaryEnergy`` double kWh/yr >= 0 No See [#]_ Electric auxiliary energy
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
===================================================== ======= ========= =============== ======== ============== =========================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -1807,7 +1812,8 @@ Each shared boiler (serving multiple dwelling units) is entered as a ``/HPXML/Bu
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``ElectricAuxiliaryEnergy`` or ``extension/SharedLoopWatts`` double kWh/yr or W >= 0 No See [#]_ Electric auxiliary energy or shared loop power
``ElectricAuxiliaryEnergy`` or ``extension/FanCoilWatts`` double kWh/yr or W >= 0 No [#]_ Electric auxiliary energy or fan coil power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
============================================================ ======= =========== =============== ======== ================== =========================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -1847,7 +1853,8 @@ Each stove is entered as a ``/HPXML/Building/BuildingDetails/Systems/HVAC/HVACPl
``AnnualHeatingEfficiency[Units="Percent"]/Value`` double frac > 0, <= 1 Yes Efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWatts`` double W >= 0 No 40 Fan power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
==================================================== ======= ====== =============== ======== ============== ===================
.. [#] HeatingSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
@@ -1873,7 +1880,8 @@ Each space heater is entered as a ``/HPXML/Building/BuildingDetails/Systems/HVAC
``AnnualHeatingEfficiency[Units="Percent"]/Value`` double frac > 0, <= 1 Yes Efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWatts`` double W >= 0 No 0 Fan power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
================================================== ======= ====== =============== ======== ============== ===================
.. [#] HeatingSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
@@ -1902,7 +1910,8 @@ Instead of modeling fireplaces as serving a fraction of the heating load, firepl
``AnnualHeatingEfficiency[Units="Percent"]/Value`` double frac > 0, <= 1 Yes Efficiency
``FractionHeatLoadServed`` double frac >= 0, <= 1 [#]_ See [#]_ Fraction of heating load served
``extension/FanPowerWatts`` double W >= 0 No 0 Fan power
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
======================================================== ======= ====== =============== ======== ============== ===================
.. [#] HeatingSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
@@ -1951,7 +1960,8 @@ Each central air conditioner is entered as a ``/HPXML/Building/BuildingDetails/S
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
``extension/ChargeDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed refrigerant charges [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 50.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
================================================================ ======= =========== ======================= ======== ============== ===========================================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -1996,7 +2006,8 @@ Each room air conditioner is entered as a ``/HPXML/Building/BuildingDetails/Syst
``SensibleHeatFraction`` double frac > 0.5, <= 1 No 0.65 Sensible heat fraction
``IntegratedHeatingSystemFuel`` string See [#]_ No Fuel type of integrated heater
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 0.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
============================================================== ====== ====== ==================== ======== ============== ============================================
.. [#] Cooling capacity autosized per ACCA Manual J/S based on cooling design load.
@@ -2036,7 +2047,8 @@ Each packaged terminal air conditioner (PTAC) is entered as a ``/HPXML/Building/
``SensibleHeatFraction`` double frac > 0.5, <= 1 No 0.65 Sensible heat fraction
``IntegratedHeatingSystemFuel`` string See [#]_ No Fuel type of integrated heater
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 0.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
============================================================== ====== ====== ================================= ======== ============== ==========================================
.. [#] Cooling capacity autosized per ACCA Manual J/S based on cooling design load.
@@ -2073,7 +2085,8 @@ Each evaporative cooler is entered as a ``/HPXML/Building/BuildingDetails/System
``CoolingSystemFuel`` string electricity Yes Fuel type
``CoolingCapacity`` double Btu/hr >= 0 No autosized [#]_ Cooling output capacity
``FractionCoolLoadServed`` double frac >= 0, <= 1 [#]_ Yes Fraction of cooling load served
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
====================================== ======== ====== ================== ======== ============== ==================================
.. [#] If DistributionSystem provided, HVACDistribution type must be :ref:`hvac_distribution_air` (type: "regular velocity") or :ref:`hvac_distribution_dse`.
@@ -2105,7 +2118,8 @@ Each mini-split air conditioner is entered as a ``/HPXML/Building/BuildingDetail
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
``extension/ChargeDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed refrigerant charges [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 50.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
================================================================ ======== ====== =============== ======== ============== ===========================================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -2150,7 +2164,8 @@ Each shared chiller (serving multiple dwelling units) is entered as a ``/HPXML/B
``AnnualCoolingEfficiency[Units="kW/ton"]/Value`` double kW/ton > 0 Yes Rated efficiency
``extension/SharedLoopWatts`` double W >= 0 Yes Pumping and fan power serving the system
``extension/FanCoilWatts`` double W >= 0 See [#]_ Fan coil power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
================================================= ======== ====== =============== ======== ========= =========================================
.. [#] HVACDistribution type must be :ref:`hvac_distribution_hydronic` (type: "radiator", "baseboard", "radiant floor", "radiant ceiling", or "water loop") or :ref:`hvac_distribution_air` (type: "fan coil").
@@ -2180,7 +2195,8 @@ Each shared cooling tower (serving multiple dwelling units) is entered as a ``/H
``CoolingSystemFuel`` string electricity Yes Fuel type
``FractionCoolLoadServed`` double frac >= 0, <= 1 [#]_ Yes Fraction of cooling load served
``extension/SharedLoopWatts`` double W >= 0 Yes Pumping and fan power serving the system
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
===================================== ======== ====== =============== ======== ========= =========================================
.. [#] HVACDistribution type must be :ref:`hvac_distribution_hydronic` (type: "water loop").
@@ -2238,8 +2254,10 @@ Each air-to-air heat pump is entered as a ``/HPXML/Building/BuildingDetails/Syst
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
``extension/ChargeDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed refrigerant charges [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 50.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
================================================================ ======= ======== ======================== ======== ============== =================================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -2316,8 +2334,10 @@ Each ``HeatPump`` is expected to represent a single outdoor unit, whether connec
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
``extension/ChargeDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed refrigerant charges [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 50.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
================================================================ ======== ======== ======================== ======== ============== ==============================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -2379,8 +2399,10 @@ Each packaged terminal heat pump is entered as a ``/HPXML/Building/BuildingDetai
``AnnualHeatingEfficiency[Units="COP"]/Value`` double W/W > 0 Yes Rated heating efficiency
``extension/HeatingCapacityRetention[Fraction | Temperature]`` double frac | F >= 0, < 1 | <= 17 No 0.425 | 5 Heating output capacity retention at cold temperature [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 0.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
=============================================================== ======== ======== =========================== ======== ============== ==============================================
.. [#] Heating capacity autosized per ACCA Manual J/S based on heating design load (unless a different HeatPumpSizingMethodology was selected in :ref:`hvac_sizing_control`).
@@ -2421,8 +2443,10 @@ Each room air conditioner with reverse cycle is entered as a ``/HPXML/Building/B
``AnnualHeatingEfficiency[Units="COP"]/Value`` double W/W > 0 Yes Rated heating efficiency
``extension/HeatingCapacityRetention[Fraction | Temperature]`` double frac | F >= 0, < 1 | <= 17 No 0.425 | 5 Heating output capacity retention at cold temperature [#]_
``extension/CrankcaseHeaterPowerWatts`` double W >= 0 No 0.0 Crankcase heater power
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
=============================================================== ======== ======== ======================================= ======== ============== ==============================================
.. [#] Heating capacity autosized per ACCA Manual J/S based on heating design load (unless a different HeatPumpSizingMethodology was selected in :ref:`hvac_sizing_control`).
@@ -2469,8 +2493,10 @@ Each ground-to-air heat pump is entered as a ``/HPXML/Building/BuildingDetails/S
``extension/FanPowerWattsPerCFM`` double W/cfm >= 0 No See [#]_ Blower fan efficiency at maximum fan speed
``extension/AirflowDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed airflows [#]_
``extension/ChargeDefectRatio`` double frac >= -0.9, <= 9 No 0.0 Deviation between design/installed refrigerant charges [#]_
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
=============================================== ======== ====== =============== ======== ============== ==============================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -2526,8 +2552,10 @@ Each water-loop-to-air heat pump is entered as a ``/HPXML/Building/BuildingDetai
``BackupType`` string See [#]_ No Type of backup heating
``AnnualCoolingEfficiency[Units="EER"]/Value`` double Btu/Wh > 0 See [#]_ Rated cooling efficiency
``AnnualHeatingEfficiency[Units="COP"]/Value`` double W/W > 0 See [#]_ Rated heating efficiency
- ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing scaling factor
- ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing scaling factor
+ ``extension/CoolingAutosizingFactor`` double frac > 0 No 1.0 Cooling autosizing capacity multiplier
+ ``extension/HeatingAutosizingFactor`` double frac > 0 No 1.0 Heating autosizing capacity multiplier
+ ``extension/CoolingAutosizingLimit`` double Btu/hr > 0 No Cooling autosizing capacity limit
+ ``extension/HeatingAutosizingLimit`` double Btu/hr > 0 No Heating autosizing capacity limit
=============================================== ======== ====== ================= ======== ============== ==============================================
.. [#] UnitLocation choices are "conditioned space", "basement - unconditioned", "basement - conditioned", "attic - unvented", "attic - vented", "garage", "crawlspace - unvented", "crawlspace - vented", "crawlspace - conditioned", "other exterior", "other housing unit", "other heated space", "other multifamily buffer space", "other non-freezing space", "roof deck", "manufactured home belly", or "unconditioned space".
@@ -2586,7 +2614,8 @@ If a backup type of "integrated" is provided, additional information is entered
``BackupSystemFuel`` string See [#]_ Yes Integrated backup heating fuel type
``BackupAnnualHeatingEfficiency[Units="Percent" or Units="AFUE"]/Value`` double frac > 0, <= 1 Yes Integrated backup heating efficiency
``BackupHeatingCapacity`` double Btu/hr >= 0 No autosized [#]_ Integrated backup heating output capacity
- ``extension/BackupHeatingAutosizingFactor`` double frac > 0 No 1.0 Backup Heating autosizing scaling factor
+ ``extension/BackupHeatingAutosizingFactor`` double frac > 0 No 1.0 Backup Heating autosizing capacity multiplier
+ ``extension/BackupHeatingAutosizingLimit`` double Btu/hr > 0 No Backup Heating autosizing capacity limit
============================================================================= ======== ====== =========== ======== ============== ==========================================
.. [#] BackupSystemFuel choices are "electricity", "natural gas", "fuel oil", "fuel oil 1", "fuel oil 2", "fuel oil 4", "fuel oil 5/6", "diesel", "propane", "kerosene", "coal", "coke", "bituminous coal", "wood", or "wood pellets".
diff --git a/hpxml-measures/tasks.rb b/hpxml-measures/tasks.rb
index af6a27b45..9e067b3e2 100644
--- a/hpxml-measures/tasks.rb
+++ b/hpxml-measures/tasks.rb
@@ -95,10 +95,15 @@ def create_hpxmls
end
hpxml = HPXML.new(hpxml_path: hpxml_path)
- if hpxml_path.include? 'ASHRAE_Standard_140'
+ if hpxml_path.include?('ASHRAE_Standard_140') || hpxml_path.include?('HERS_HVAC') || hpxml_path.include?('HERS_DSE')
apply_hpxml_modification_ashrae_140(hpxml)
+ if hpxml_path.include?('HERS_HVAC') || hpxml_path.include?('HERS_DSE')
+ apply_hpxml_modification_hers_hvac_dse(hpxml_path, hpxml)
+ end
+ elsif hpxml_path.include?('HERS_Hot_Water')
+ apply_hpxml_modification_hers_hot_water(hpxml)
else
- apply_hpxml_modification(File.basename(hpxml_path), hpxml)
+ apply_hpxml_modification_sample_files(hpxml_path, hpxml)
end
hpxml_doc = hpxml.to_doc()
@@ -128,6 +133,7 @@ def create_hpxmls
def apply_hpxml_modification_ashrae_140(hpxml)
# Set detailed HPXML values for ASHRAE 140 test files
+ hpxml_bldg = hpxml.buildings[0]
# ------------ #
# HPXML Header #
@@ -137,95 +143,149 @@ def apply_hpxml_modification_ashrae_140(hpxml)
hpxml.header.created_date_and_time = Time.new(2000, 1, 1, 0, 0, 0, '-07:00').strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
hpxml.header.apply_ashrae140_assumptions = true
- hpxml.buildings.each do |hpxml_bldg|
- # --------------------- #
- # HPXML BuildingSummary #
- # --------------------- #
+ # --------------------- #
+ # HPXML BuildingSummary #
+ # --------------------- #
- hpxml_bldg.site.azimuth_of_front_of_home = nil
+ hpxml_bldg.site.azimuth_of_front_of_home = nil
- # --------------- #
- # HPXML Enclosure #
- # --------------- #
+ # --------------- #
+ # HPXML Enclosure #
+ # --------------- #
- hpxml_bldg.attics[0].vented_attic_ach = 2.4
- hpxml_bldg.foundations.reverse_each do |foundation|
- foundation.delete
+ hpxml_bldg.attics[0].vented_attic_ach = 2.4
+ hpxml_bldg.foundations.reverse_each do |foundation|
+ foundation.delete
+ end
+ hpxml_bldg.roofs.each do |roof|
+ if roof.roof_color == HPXML::ColorReflective
+ roof.solar_absorptance = 0.2
+ else
+ roof.solar_absorptance = 0.6
end
- hpxml_bldg.roofs.each do |roof|
- if roof.roof_color == HPXML::ColorReflective
- roof.solar_absorptance = 0.2
- else
- roof.solar_absorptance = 0.6
- end
- roof.emittance = 0.9
- roof.roof_color = nil
+ roof.emittance = 0.9
+ roof.roof_color = nil
+ end
+ (hpxml_bldg.walls + hpxml_bldg.rim_joists).each do |wall|
+ if wall.color == HPXML::ColorReflective
+ wall.solar_absorptance = 0.2
+ else
+ wall.solar_absorptance = 0.6
end
- (hpxml_bldg.walls + hpxml_bldg.rim_joists).each do |wall|
- if wall.color == HPXML::ColorReflective
- wall.solar_absorptance = 0.2
+ wall.emittance = 0.9
+ wall.color = nil
+ if wall.is_a?(HPXML::Wall)
+ if wall.attic_wall_type == HPXML::AtticWallTypeGable
+ wall.insulation_assembly_r_value = 2.15
else
- wall.solar_absorptance = 0.6
- end
- wall.emittance = 0.9
- wall.color = nil
- if wall.is_a?(HPXML::Wall)
- if wall.attic_wall_type == HPXML::AtticWallTypeGable
- wall.insulation_assembly_r_value = 2.15
- else
- wall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
- wall.interior_finish_thickness = 0.5
- end
+ wall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+ wall.interior_finish_thickness = 0.5
end
end
- hpxml_bldg.floors.each do |floor|
- next unless floor.is_ceiling
+ end
+ hpxml_bldg.floors.each do |floor|
+ next unless floor.is_ceiling
- floor.interior_finish_type = HPXML::InteriorFinishGypsumBoard
- floor.interior_finish_thickness = 0.5
- end
- hpxml_bldg.foundation_walls.each do |fwall|
- if fwall.insulation_interior_r_value == 0
- fwall.interior_finish_type = HPXML::InteriorFinishNone
- else
- fwall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
- fwall.interior_finish_thickness = 0.5
- end
- end
- if hpxml_bldg.doors.size == 1
- hpxml_bldg.doors[0].area /= 2.0
- hpxml_bldg.doors << hpxml_bldg.doors[0].dup
- hpxml_bldg.doors[1].azimuth = 0
- hpxml_bldg.doors[1].id = 'Door2'
+ floor.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+ floor.interior_finish_thickness = 0.5
+ end
+ hpxml_bldg.foundation_walls.each do |fwall|
+ if fwall.insulation_interior_r_value == 0
+ fwall.interior_finish_type = HPXML::InteriorFinishNone
+ else
+ fwall.interior_finish_type = HPXML::InteriorFinishGypsumBoard
+ fwall.interior_finish_thickness = 0.5
end
- hpxml_bldg.windows.each do |window|
- next if window.overhangs_depth.nil?
+ end
+ if hpxml_bldg.doors.size == 1
+ hpxml_bldg.doors[0].area /= 2.0
+ hpxml_bldg.doors << hpxml_bldg.doors[0].dup
+ hpxml_bldg.doors[1].azimuth = 0
+ hpxml_bldg.doors[1].id = 'Door2'
+ end
+ hpxml_bldg.windows.each do |window|
+ next if window.overhangs_depth.nil?
- window.overhangs_distance_to_bottom_of_window = 6.0
- end
+ window.overhangs_distance_to_bottom_of_window = 6.0
+ end
- # ---------- #
- # HPXML HVAC #
- # ---------- #
+ # ---------- #
+ # HPXML HVAC #
+ # ---------- #
+ if hpxml_bldg.hvac_controls.empty?
hpxml_bldg.hvac_controls.add(id: "HVACControl#{hpxml_bldg.hvac_controls.size + 1}",
heating_setpoint_temp: 68.0,
cooling_setpoint_temp: 78.0)
+ end
- # --------------- #
- # HPXML MiscLoads #
- # --------------- #
+ # --------------- #
+ # HPXML MiscLoads #
+ # --------------- #
- next unless hpxml_bldg.plug_loads[0].kwh_per_year > 0
+ return unless hpxml_bldg.plug_loads[0].kwh_per_year > 0
- hpxml_bldg.plug_loads[0].weekday_fractions = '0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660'
- hpxml_bldg.plug_loads[0].weekend_fractions = '0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660'
- hpxml_bldg.plug_loads[0].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'
+ hpxml_bldg.plug_loads[0].weekday_fractions = '0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660'
+ hpxml_bldg.plug_loads[0].weekend_fractions = '0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660'
+ hpxml_bldg.plug_loads[0].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'
+end
+
+def apply_hpxml_modification_hers_hvac_dse(hpxml_path, hpxml)
+ # Set detailed HPXML values for HERS HVAC/DSE test files
+ hpxml_bldg = hpxml.buildings[0]
+
+ if hpxml_path.include? 'HERS_HVAC'
+ hpxml_bldg.hvac_distributions.clear
+ hpxml_bldg.hvac_distributions.add(id: 'HVACDistribution1',
+ distribution_system_type: HPXML::HVACDistributionTypeDSE,
+ annual_heating_dse: 1.0,
+ annual_cooling_dse: 1.0)
+ end
+ if hpxml_path.include? 'HERS_DSE'
+ # For DSE tests, use effective R-values instead of nominal R-values to match the test specs.
+ hpxml_bldg.hvac_distributions[0].ducts.each do |duct|
+ next if duct.duct_insulation_r_value.nil?
+
+ if duct.duct_insulation_r_value == 0
+ duct.duct_insulation_r_value = nil
+ duct.duct_effective_r_value = 1.5
+ elsif duct.duct_insulation_r_value == 6
+ duct.duct_insulation_r_value = nil
+ duct.duct_effective_r_value = 7
+ else
+ fail 'Unexpected error.'
+ end
+ end
end
end
-def apply_hpxml_modification(hpxml_file, hpxml)
+def apply_hpxml_modification_hers_hot_water(hpxml)
+ # Set detailed HPXML values for HERS Hot Water test files
+ hpxml_bldg = hpxml.buildings[0]
+
+ hpxml.header.xml_generated_by = 'tasks.rb'
+ hpxml.header.created_date_and_time = Time.new(2000, 1, 1, 0, 0, 0, '-07:00').strftime('%Y-%m-%dT%H:%M:%S%:z') # Hard-code to prevent diffs
+
+ (hpxml_bldg.roofs + hpxml_bldg.walls + hpxml_bldg.rim_joists).each do |surface|
+ surface.solar_absorptance = 0.75
+ surface.emittance = 0.9
+ if surface.is_a? HPXML::Roof
+ surface.roof_color = nil
+ else
+ surface.color = nil
+ end
+ end
+
+ hpxml_bldg.hvac_distributions.clear
+ hpxml_bldg.hvac_distributions.add(id: 'HVACDistribution1',
+ distribution_system_type: HPXML::HVACDistributionTypeDSE,
+ annual_heating_dse: 1.0,
+ annual_cooling_dse: 1.0)
+end
+
+def apply_hpxml_modification_sample_files(hpxml_path, hpxml)
# Set detailed HPXML values for sample files
+ hpxml_file = File.basename(hpxml_path)
hpxml_bldg = hpxml.buildings[0]
# ------------ #
@@ -1351,11 +1411,7 @@ def apply_hpxml_modification(hpxml_file, hpxml)
end
end
end
- if hpxml_file.include? 'install-quality'
- hpxml_bldg.hvac_systems.each do |hvac_system|
- hvac_system.fan_watts_per_cfm = 0.365
- end
- elsif ['base-hvac-setpoints-daily-setbacks.xml'].include? hpxml_file
+ if ['base-hvac-setpoints-daily-setbacks.xml'].include? hpxml_file
hpxml_bldg.hvac_controls[0].heating_setback_temp = 66
hpxml_bldg.hvac_controls[0].heating_setback_hours_per_week = 7 * 7
hpxml_bldg.hvac_controls[0].heating_setback_start_hour = 23 # 11pm
@@ -1680,7 +1736,8 @@ def apply_hpxml_modification(hpxml_file, hpxml)
location: HPXML::LocationConditionedSpace)
end
if ['base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml',
- 'base-hvac-autosize-air-to-air-heat-pump-var-speed-backup-furnace.xml'].include? hpxml_file
+ 'base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-airflow.xml',
+ 'base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml'].include? hpxml_file
# Switch backup boiler with hydronic distribution to backup furnace with air distribution
hpxml_bldg.heating_systems[0].heating_system_type = HPXML::HVACTypeFurnace
hpxml_bldg.hvac_distributions[0].distribution_system_type = HPXML::HVACDistributionTypeAir
@@ -1704,6 +1761,13 @@ def apply_hpxml_modification(hpxml_file, hpxml)
if hpxml_file.include? 'base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml'
hpxml_bldg.geothermal_loops[0].shank_spacing = 2.5
end
+ if hpxml_file.include? 'HERS_HVAC'
+ hpxml_bldg.hvac_distributions.clear
+ hpxml_bldg.hvac_distributions.add(id: "HVACDistribution#{hpxml_bldg.hvac_distributions.size + 1}",
+ distribution_system_type: HPXML::HVACDistributionTypeDSE,
+ annual_heating_dse: 1.0,
+ annual_cooling_dse: 1.0)
+ end
# ------------------ #
# HPXML WaterHeating #
diff --git a/hpxml-measures/workflow/hpxml_inputs.json b/hpxml-measures/workflow/hpxml_inputs.json
index 307c61bfd..ac210cf06 100644
--- a/hpxml-measures/workflow/hpxml_inputs.json
+++ b/hpxml-measures/workflow/hpxml_inputs.json
@@ -100,7 +100,6 @@
"heat_pump_heating_efficiency": 0,
"heat_pump_cooling_efficiency_type": "SEER",
"heat_pump_cooling_efficiency": 0,
- "heat_pump_cooling_sensible_heat_fraction": 0,
"heat_pump_fraction_heat_load_served": 0,
"heat_pump_fraction_cool_load_served": 0,
"heat_pump_backup_type": "none",
@@ -143,7 +142,7 @@
"dwhr_facilities_connected": "none",
"water_fixtures_shower_low_flow": false,
"water_fixtures_sink_low_flow": false,
- "water_fixtures_usage_multiplier": 0,
+ "water_fixtures_usage_multiplier": null,
"solar_thermal_system_type": "none",
"solar_thermal_collector_area": 0,
"solar_thermal_collector_loop_type": "liquid indirect",
@@ -360,6 +359,247 @@
"roof_color": "reflective",
"wall_color": "reflective"
},
+ "tests/HERS_HVAC/HVAC1a.xml": {
+ "parent_hpxml": "tests/ASHRAE_Standard_140/L100AL.xml",
+ "heating_system_type": "Furnace",
+ "heating_system_fuel": "natural gas",
+ "heating_system_heating_capacity": 56100,
+ "heating_system_heating_efficiency": 0.78,
+ "heating_system_fraction_heat_load_served": 1.0,
+ "cooling_system_type": "central air conditioner",
+ "cooling_system_cooling_capacity": 38300,
+ "cooling_system_cooling_efficiency": 10,
+ "cooling_system_cooling_efficiency_type": "SEER",
+ "cooling_system_fraction_cool_load_served": 1,
+ "hvac_blower_fan_watts_per_cfm": 0.5
+ },
+ "tests/HERS_HVAC/HVAC1b.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC1a.xml",
+ "cooling_system_cooling_efficiency": 13
+ },
+ "tests/HERS_HVAC/HVAC2a.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC1a.xml",
+ "weather_station_epw_filepath": "USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw"
+ },
+ "tests/HERS_HVAC/HVAC2b.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC2a.xml",
+ "heating_system_heating_efficiency": 0.9
+ },
+ "tests/HERS_HVAC/HVAC2c.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC2a.xml",
+ "heating_system_type": "none",
+ "cooling_system_type": "none",
+ "heat_pump_type": "air-to-air",
+ "heat_pump_cooling_capacity": 56100,
+ "heat_pump_heating_capacity": 56100,
+ "heat_pump_backup_type": "integrated",
+ "heat_pump_backup_fuel": "electricity",
+ "heat_pump_backup_heating_capacity": 34121,
+ "heat_pump_backup_heating_efficiency": 1.0,
+ "heat_pump_fraction_heat_load_served": 1.0,
+ "heat_pump_fraction_cool_load_served": 1.0,
+ "heat_pump_heating_efficiency_type": "HSPF",
+ "heat_pump_heating_efficiency": 6.8,
+ "heat_pump_cooling_efficiency_type": "SEER",
+ "heat_pump_cooling_efficiency": 10
+ },
+ "tests/HERS_HVAC/HVAC2d.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC2c.xml",
+ "heat_pump_heating_efficiency": 9.85,
+ "heat_pump_cooling_efficiency": 13
+ },
+ "tests/HERS_HVAC/HVAC2e.xml": {
+ "parent_hpxml": "tests/HERS_HVAC/HVAC2a.xml",
+ "heating_system_fuel": "electricity",
+ "heating_system_heating_efficiency": 1.0
+ },
+ "tests/HERS_DSE/HVAC3a.xml": {
+ "parent_hpxml": "tests/ASHRAE_Standard_140/L322XC.xml",
+ "geometry_foundation_type": "UnconditionedBasement",
+ "geometry_unit_cfa": 1539,
+ "air_leakage_value": 0.67,
+ "floor_over_foundation_assembly_r": 13.85,
+ "heating_system_type": "Furnace",
+ "heating_system_fuel": "natural gas",
+ "heating_system_heating_capacity": 46600,
+ "heating_system_heating_efficiency": 0.78,
+ "heating_system_fraction_heat_load_served": 1.0,
+ "cooling_system_type": "central air conditioner",
+ "cooling_system_cooling_capacity": 38400,
+ "cooling_system_cooling_efficiency": 10,
+ "cooling_system_cooling_efficiency_type": "SEER",
+ "cooling_system_fraction_cool_load_served": 1,
+ "hvac_blower_fan_watts_per_cfm": 0.5,
+ "ducts_supply_insulation_r": 0,
+ "ducts_supply_location": "conditioned space",
+ "ducts_supply_surface_area": 308,
+ "ducts_return_insulation_r": 0,
+ "ducts_return_location": "conditioned space",
+ "ducts_return_surface_area": 77
+ },
+ "tests/HERS_DSE/HVAC3b.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3a.xml",
+ "heating_system_heating_capacity": 56000,
+ "ducts_supply_location": "basement - unconditioned",
+ "ducts_return_location": "basement - unconditioned"
+ },
+ "tests/HERS_DSE/HVAC3c.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3b.xml",
+ "heating_system_heating_capacity": 49000,
+ "ducts_supply_insulation_r": 6,
+ "ducts_return_insulation_r": 6
+ },
+ "tests/HERS_DSE/HVAC3d.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3c.xml",
+ "heating_system_heating_capacity": 61000,
+ "ducts_supply_leakage_to_outside_value": 125.0,
+ "ducts_return_leakage_to_outside_value": 125.0
+ },
+ "tests/HERS_DSE/HVAC3e.xml": {
+ "parent_hpxml": "tests/ASHRAE_Standard_140/L100AL.xml",
+ "heating_system_type": "Furnace",
+ "heating_system_fuel": "natural gas",
+ "heating_system_heating_capacity": 46600,
+ "heating_system_heating_efficiency": 0.78,
+ "heating_system_fraction_heat_load_served": 1.0,
+ "cooling_system_type": "central air conditioner",
+ "cooling_system_cooling_capacity": 38400,
+ "cooling_system_cooling_efficiency": 10,
+ "cooling_system_cooling_efficiency_type": "SEER",
+ "cooling_system_fraction_cool_load_served": 1,
+ "hvac_blower_fan_watts_per_cfm": 0.5,
+ "ducts_supply_insulation_r": 0,
+ "ducts_supply_location": "conditioned space",
+ "ducts_supply_surface_area": 308,
+ "ducts_return_insulation_r": 0,
+ "ducts_return_location": "conditioned space",
+ "ducts_return_surface_area": 77
+ },
+ "tests/HERS_DSE/HVAC3f.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3e.xml",
+ "cooling_system_cooling_capacity": 49900,
+ "ducts_supply_location": "attic - vented",
+ "ducts_return_location": "attic - vented"
+ },
+ "tests/HERS_DSE/HVAC3g.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3f.xml",
+ "cooling_system_cooling_capacity": 42200,
+ "ducts_supply_insulation_r": 6,
+ "ducts_return_insulation_r": 6
+ },
+ "tests/HERS_DSE/HVAC3h.xml": {
+ "parent_hpxml": "tests/HERS_DSE/HVAC3g.xml",
+ "cooling_system_cooling_capacity": 55000,
+ "ducts_supply_leakage_to_outside_value": 125.0,
+ "ducts_return_leakage_to_outside_value": 125.0
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-01.xml": {
+ "parent_hpxml": "tests/ASHRAE_Standard_140/L100AC.xml",
+ "geometry_unit_num_occupants": null,
+ "air_leakage_units": "EffectiveLeakageArea",
+ "air_leakage_value": 79.8,
+ "weather_station_epw_filepath": "USA_MN_Duluth.Intl.AP.727450_TMY3.epw",
+ "geometry_unit_num_bedrooms": 2,
+ "wall_assembly_r": 17.54,
+ "floor_over_foundation_assembly_r": 30.3,
+ "ceiling_assembly_r": 38.46,
+ "door_rvalue": 2.86,
+ "window_shgc": 0.4,
+ "window_ufactor": 0.35,
+ "window_interior_shading_winter": null,
+ "window_interior_shading_summer": null,
+ "heating_system_type": "Furnace",
+ "heating_system_fuel": "natural gas",
+ "heating_system_heating_efficiency": 0.78,
+ "heating_system_fraction_heat_load_served": 1.0,
+ "cooling_system_type": "central air conditioner",
+ "cooling_system_cooling_efficiency": 13,
+ "cooling_system_cooling_efficiency_type": "SEER",
+ "cooling_system_fraction_cool_load_served": 1,
+ "water_heater_type": "storage water heater",
+ "water_heater_fuel_type": "natural gas",
+ "water_heater_tank_volume": 40.0,
+ "water_heater_efficiency_type": "EnergyFactor",
+ "water_heater_efficiency": 0.56,
+ "water_heater_recovery_efficiency": 0.78,
+ "water_heater_location": "conditioned space",
+ "clothes_washer_present": true,
+ "clothes_dryer_present": true,
+ "dishwasher_present": true,
+ "refrigerator_present": true,
+ "cooking_range_oven_present": true,
+ "lighting_present": true,
+ "misc_plug_loads_other_annual_kwh": null,
+ "misc_plug_loads_other_frac_sensible": null,
+ "misc_plug_loads_other_frac_latent": null,
+ "misc_plug_loads_television_present": true,
+ "lighting_interior_fraction_cfl": 0.1
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-02.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-01.xml",
+ "geometry_unit_num_bedrooms": 4
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-03.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-01.xml",
+ "water_heater_efficiency": 0.62
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-04.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-02.xml",
+ "water_fixtures_shower_low_flow": true,
+ "water_fixtures_sink_low_flow": true
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-05.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-02.xml",
+ "hot_water_distribution_system_type": "Recirculation",
+ "hot_water_distribution_recirc_control_type": "no control",
+ "hot_water_distribution_recirc_branch_piping_length": 10,
+ "hot_water_distribution_recirc_pump_power": 50,
+ "hot_water_distribution_pipe_r": 3
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-06.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-05.xml",
+ "hot_water_distribution_recirc_control_type": "manual demand control"
+ },
+ "tests/HERS_Hot_Water/L100AD-HW-07.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-02.xml",
+ "dwhr_facilities_connected": "all",
+ "dwhr_equal_flow": true,
+ "dwhr_efficiency": 0.54
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-01.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-01.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw",
+ "wall_assembly_r": 12.20,
+ "floor_over_foundation_assembly_r": 15.63,
+ "ceiling_assembly_r": 28.57,
+ "window_shgc": 0.4,
+ "window_ufactor": 1.2,
+ "door_rvalue": 0.83
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-02.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-02.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-03.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-03.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-04.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-04.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-05.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-05.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-06.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-06.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
+ "tests/HERS_Hot_Water/L100AM-HW-07.xml": {
+ "parent_hpxml": "tests/HERS_Hot_Water/L100AD-HW-07.xml",
+ "weather_station_epw_filepath": "USA_FL_Miami.Intl.AP.722020_TMY3.epw"
+ },
"sample_files/base.xml": {
"simulation_control_timestep": 60,
"site_type": "suburban",
@@ -469,7 +709,6 @@
"heat_pump_heating_efficiency": 0,
"heat_pump_cooling_efficiency_type": "SEER",
"heat_pump_cooling_efficiency": 0,
- "heat_pump_cooling_sensible_heat_fraction": 0,
"heat_pump_fraction_heat_load_served": 0,
"heat_pump_fraction_cool_load_served": 0,
"heat_pump_backup_type": "none",
@@ -1687,7 +1926,10 @@
"heat_pump_backup_heating_capacity": null,
"heat_pump_cooling_autosizing_factor": 1.7,
"heat_pump_heating_autosizing_factor": 1.4,
- "heat_pump_backup_heating_autosizing_factor": 0.9
+ "heat_pump_backup_heating_autosizing_factor": 0.9,
+ "heat_pump_cooling_autosizing_limit": 53000,
+ "heat_pump_heating_autosizing_limit": 44000,
+ "heat_pump_backup_heating_autosizing_limit": 28000
},
"sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml"
@@ -1768,9 +2010,13 @@
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml",
"heat_pump_cooling_capacity": null,
"heat_pump_heating_capacity": null,
+ "heating_system_2_heating_capacity": null,
"heat_pump_cooling_autosizing_factor": 1.7,
"heat_pump_heating_autosizing_factor": 1.4,
- "heating_system_2_heating_autosizing_factor": 0.9
+ "heating_system_2_heating_autosizing_factor": 0.9,
+ "heat_pump_cooling_autosizing_limit": 53000,
+ "heat_pump_heating_autosizing_limit": 44000,
+ "heating_system_2_heating_autosizing_limit": 29000
},
"sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml",
@@ -1904,7 +2150,8 @@
"sample_files/base-hvac-central-ac-only-1-speed-autosize-factor.xml": {
"parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml",
"cooling_system_cooling_capacity": null,
- "cooling_system_cooling_autosizing_factor": 1.7
+ "cooling_system_cooling_autosizing_factor": 1.7,
+ "cooling_system_cooling_autosizing_limit": 37000
},
"sample_files/base-hvac-central-ac-only-1-speed-seer2.xml": {
"parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml",
@@ -2131,7 +2378,8 @@
"sample_files/base-hvac-furnace-gas-only-autosize-factor.xml": {
"parent_hpxml": "sample_files/base-hvac-furnace-gas-only.xml",
"heating_system_heating_capacity": null,
- "heating_system_heating_autosizing_factor": 1.4
+ "heating_system_heating_autosizing_factor": 1.4,
+ "heating_system_heating_autosizing_limit": 45000
},
"sample_files/base-hvac-furnace-gas-only-pilot.xml": {
"parent_hpxml": "sample_files/base-hvac-furnace-gas-only.xml",
@@ -2217,59 +2465,70 @@
"sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml": {
"parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml": {
"parent_hpxml": "sample_files/base.xml",
"heating_system_airflow_defect_ratio": -0.25,
"cooling_system_airflow_defect_ratio": -0.25,
- "cooling_system_charge_defect_ratio": -0.25
+ "cooling_system_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml": {
"parent_hpxml": "sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml",
"heating_system_airflow_defect_ratio": -0.25,
"cooling_system_airflow_defect_ratio": -0.25,
- "cooling_system_charge_defect_ratio": -0.25
+ "cooling_system_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml": {
"parent_hpxml": "sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml",
"heating_system_airflow_defect_ratio": -0.25,
"cooling_system_airflow_defect_ratio": -0.25,
- "cooling_system_charge_defect_ratio": -0.25
+ "cooling_system_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-furnace-gas-only.xml": {
"parent_hpxml": "sample_files/base-hvac-furnace-gas-only.xml",
- "heating_system_airflow_defect_ratio": -0.25
+ "heating_system_airflow_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml": {
"parent_hpxml": "sample_files/base-hvac-ground-to-air-heat-pump.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml": {
"parent_hpxml": "sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml",
"cooling_system_airflow_defect_ratio": -0.25,
- "cooling_system_charge_defect_ratio": -0.25
+ "cooling_system_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml": {
"parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ducted.xml",
"heat_pump_airflow_defect_ratio": -0.25,
- "heat_pump_charge_defect_ratio": -0.25
+ "heat_pump_charge_defect_ratio": -0.25,
+ "hvac_blower_fan_watts_per_cfm": 0.365
},
"sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml": {
"parent_hpxml": "sample_files/base.xml",
@@ -2392,6 +2651,15 @@
"heat_pump_backup_heating_efficiency": 0,
"heat_pump_is_ducted": false
},
+ "sample_files/base-hvac-mini-split-heat-pump-ductless-autosize-factor.xml": {
+ "parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless.xml",
+ "heat_pump_cooling_capacity": null,
+ "heat_pump_heating_capacity": null,
+ "heat_pump_cooling_autosizing_factor": 1.7,
+ "heat_pump_heating_autosizing_factor": 1.4,
+ "heat_pump_cooling_autosizing_limit": 41000,
+ "heat_pump_heating_autosizing_limit": 33000
+ },
"sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml": {
"parent_hpxml": "sample_files/base-hvac-mini-split-heat-pump-ductless.xml",
"heat_pump_cooling_compressor_type": "variable speed",
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-coal.xml b/hpxml-measures/workflow/sample_files/base-appliances-coal.xml
index 1a1db0c16..f6ed71610 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-coal.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-coal.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml
index e830b9123..34fc9d332 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml
index fcadd5267..520b3f004 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-multiple.xml b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-multiple.xml
index 446754472..1141d472a 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier-multiple.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier.xml b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier.xml
index 04b735d5c..1dfe026b2 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-dehumidifier.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-freezer-temperature-dependent-schedule.xml b/hpxml-measures/workflow/sample_files/base-appliances-freezer-temperature-dependent-schedule.xml
index 9deaf74d2..339cb533b 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-freezer-temperature-dependent-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-freezer-temperature-dependent-schedule.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-gas.xml b/hpxml-measures/workflow/sample_files/base-appliances-gas.xml
index 4e82368ad..5234c47f8 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-gas.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-modified.xml b/hpxml-measures/workflow/sample_files/base-appliances-modified.xml
index e8fb375bd..69441baa1 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-modified.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-modified.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-oil.xml b/hpxml-measures/workflow/sample_files/base-appliances-oil.xml
index d6a7c24fb..8115dc874 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-oil.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-oil.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-propane.xml b/hpxml-measures/workflow/sample_files/base-appliances-propane.xml
index ce6a0133a..1277d4908 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-propane.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-propane.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-refrigerator-temperature-dependent-schedule.xml b/hpxml-measures/workflow/sample_files/base-appliances-refrigerator-temperature-dependent-schedule.xml
index 342bd740a..d3eff0e9a 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-refrigerator-temperature-dependent-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-refrigerator-temperature-dependent-schedule.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
-0.487, -0.340, -0.370, -0.361, -0.515, -0.684, -0.471, -0.159, -0.079, -0.417, -0.411, -0.386, -0.240, -0.314, -0.160, -0.121, -0.469, -0.412, -0.091, 0.077, -0.118, -0.247, -0.445, -0.544
0.019, 0.016, 0.017, 0.016, 0.018, 0.021, 0.019, 0.015, 0.015, 0.019, 0.018, 0.018, 0.016, 0.017, 0.015, 0.015, 0.020, 0.020, 0.017, 0.014, 0.016, 0.017, 0.019, 0.020
diff --git a/hpxml-measures/workflow/sample_files/base-appliances-wood.xml b/hpxml-measures/workflow/sample_files/base-appliances-wood.xml
index 41bc0d49d..4cd6c90d0 100644
--- a/hpxml-measures/workflow/sample_files/base-appliances-wood.xml
+++ b/hpxml-measures/workflow/sample_files/base-appliances-wood.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-cathedral.xml b/hpxml-measures/workflow/sample_files/base-atticroof-cathedral.xml
index 00cbb06bc..898d621e7 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-cathedral.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-cathedral.xml
@@ -424,7 +424,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-conditioned.xml b/hpxml-measures/workflow/sample_files/base-atticroof-conditioned.xml
index a9451ba74..82c43dd9c 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-conditioned.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-conditioned.xml
@@ -541,7 +541,6 @@
basement - conditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-flat.xml b/hpxml-measures/workflow/sample_files/base-atticroof-flat.xml
index 60541cdc2..369111233 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-flat.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-flat.xml
@@ -424,7 +424,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier-ceiling.xml b/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier-ceiling.xml
index d9ab22182..e5833d19e 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier-ceiling.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier-ceiling.xml
@@ -418,7 +418,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier.xml b/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier.xml
index 4070a5a8d..a8177d212 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-radiant-barrier.xml
@@ -420,7 +420,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml b/hpxml-measures/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml
index 6f762035e..15d8bcd67 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-atticroof-vented.xml b/hpxml-measures/workflow/sample_files/base-atticroof-vented.xml
index fafe24892..19f084788 100644
--- a/hpxml-measures/workflow/sample_files/base-atticroof-vented.xml
+++ b/hpxml-measures/workflow/sample_files/base-atticroof-vented.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-battery-scheduled.xml b/hpxml-measures/workflow/sample_files/base-battery-scheduled.xml
index 7e6d9da5f..74bb1605f 100644
--- a/hpxml-measures/workflow/sample_files/base-battery-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-battery-scheduled.xml
@@ -481,7 +481,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-battery.xml b/hpxml-measures/workflow/sample_files/base-battery.xml
index 57ede7482..ce9bc48b3 100644
--- a/hpxml-measures/workflow/sample_files/base-battery.xml
+++ b/hpxml-measures/workflow/sample_files/base-battery.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml
index d2e6a2a74..507b91a7a 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multifamily-buffer-space.xml
@@ -377,7 +377,6 @@
other multifamily buffer space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple-hvac-none.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple-hvac-none.xml
index 6a3364fe5..4d6eb407f 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple-hvac-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple-hvac-none.xml
@@ -396,7 +396,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml
index 379f99953..bd5e75dca 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml
@@ -489,7 +489,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml
index 021e45ea7..771bae909 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-non-freezing-space.xml
@@ -377,7 +377,6 @@
other non-freezing space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml
index b3b49e44c..0b61ae323 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-heated-space.xml
@@ -377,7 +377,6 @@
other heated space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml
index c77849f8c..52d864a9b 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-other-housing-unit.xml
@@ -377,7 +377,6 @@
other housing unit
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml
index 5e85a1139..da823a8bc 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-infil-compartmentalization-test.xml
@@ -373,7 +373,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml
index bf11d6a92..a6e32dd55 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-residents-1.xml
@@ -373,7 +373,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml
index b0f3ea0c5..c7892766f 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-baseboard.xml
@@ -347,7 +347,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml
index 278b0f1fc..565c94c81 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil-ducted.xml
@@ -379,7 +379,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml
index faa84591c..e6ad08137 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-fan-coil.xml
@@ -349,7 +349,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml
index abb4be9a2..67b107acc 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-chiller-water-loop-heat-pump.xml
@@ -401,7 +401,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml
index dbd94b2a2..d6a965d53 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-cooling-tower-water-loop-heat-pump.xml
@@ -396,7 +396,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml
index 8619f46f3..4eec1e357 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml
@@ -328,7 +328,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml
index 85109407b..1e08671b3 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml
@@ -359,7 +359,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml
index 681c3ce55..9ec2538f4 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-eae.xml
@@ -326,7 +326,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml
index c278bec0e..46cdb4591 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-fireplace-elec.xml
@@ -344,7 +344,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml
index 21f1e8afc..18c0a737e 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml
@@ -329,7 +329,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml
index 4e3360eab..da074eaac 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml
@@ -377,7 +377,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml
index 537c5a8b8..303e2fe66 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml
@@ -328,7 +328,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml
index bd83c9208..c401164d1 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml
@@ -359,7 +359,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml
index a8d7e39c4..c166379d2 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml
@@ -329,7 +329,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml
index 0e5046104..c4b7b38bb 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml
@@ -377,7 +377,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml
index e4d1973cc..1f92e7e8a 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml
@@ -372,7 +372,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml
index 491757147..73d2c6088 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml
@@ -382,7 +382,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml
index 40d637aab..619ade9c3 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml
@@ -374,7 +374,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml
index 5fa2fc053..428810f11 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml
@@ -396,7 +396,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml
index b1ec5e271..c37a71047 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml
@@ -380,7 +380,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml
index 0c48f80cd..9328bace5 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-multiple.xml
@@ -592,7 +592,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml
index ce8d8f4ee..b2ca2ea70 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml
@@ -411,7 +411,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml
index d1fdf62a8..93d97f34b 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml
@@ -395,7 +395,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml
index 48460f394..bca0b03eb 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml
index 665159456..98d42006f 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml
@@ -391,7 +391,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml
index 9636250fb..665cf89f0 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml
@@ -373,7 +373,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-beds-0.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-beds-0.xml
index bf2d965b6..77a88d89b 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-beds-0.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-beds-0.xml
@@ -382,7 +382,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml
index 2cec4d721..8849fcc52 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml
@@ -385,7 +385,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml
index d3cb270a6..866b9af36 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml
@@ -382,7 +382,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml
index 74a0d731b..25da4ad59 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml
@@ -375,7 +375,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit.xml
index 55726dab4..999041f15 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-unit.xml
@@ -370,7 +370,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-whole-building.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-whole-building.xml
index 13aa4bc7c..a5397b8e5 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-mf-whole-building.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-mf-whole-building.xml
@@ -436,7 +436,6 @@
conditioned space
650.0
- true
@@ -940,7 +939,6 @@
conditioned space
650.0
- true
@@ -1332,7 +1330,6 @@
conditioned space
650.0
- true
@@ -1724,7 +1721,6 @@
conditioned space
650.0
- true
@@ -2173,7 +2169,6 @@
conditioned space
650.0
- true
@@ -2622,7 +2617,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml
index 85c78c0ef..588cd11a2 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-2stories.xml
@@ -521,7 +521,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml
index e056b3479..c20994411 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-atticroof-cathedral.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml
index 8275c2031..c8316acf4 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit-infil-compartmentalization-test.xml
@@ -521,7 +521,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit.xml b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit.xml
index 8418c4add..7e9375da8 100644
--- a/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit.xml
+++ b/hpxml-measures/workflow/sample_files/base-bldgtype-sfa-unit.xml
@@ -521,7 +521,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless-outside.xml b/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless-outside.xml
index 038031352..a4e43a2da 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless-outside.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless-outside.xml
@@ -414,7 +414,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless.xml b/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless.xml
index 4c87424d7..0b00b741c 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-combi-tankless.xml
@@ -414,7 +414,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-2-speed.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-2-speed.xml
index de58b4c22..78cee55f1 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-2-speed.xml
@@ -448,7 +448,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-gshp.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-gshp.xml
index 6341bed98..2ce2c7b6e 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-gshp.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-gshp.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-hpwh.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-hpwh.xml
index a9a6bb54b..ebe4de80c 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-hpwh.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-hpwh.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-tankless.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-tankless.xml
index f5ce43157..2d79b5c35 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-tankless.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-tankless.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-var-speed.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-var-speed.xml
index 3f1e774cb..4a461090d 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater-var-speed.xml
@@ -448,7 +448,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater.xml b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater.xml
index 9fa0674e5..a76998ca7 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-desuperheater.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-desuperheater.xml
@@ -448,7 +448,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-dwhr.xml b/hpxml-measures/workflow/sample_files/base-dhw-dwhr.xml
index d3911a0e2..09d4a45b4 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-dwhr.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-dwhr.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect-detailed-setpoints.xml
index 41ac7e10d..fd35a4a0b 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect-detailed-setpoints.xml
@@ -417,7 +417,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect-dse.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect-dse.xml
index 16a3f2399..5c23629ad 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect-dse.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect-dse.xml
@@ -415,7 +415,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect-outside.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect-outside.xml
index df50265c1..8b8de6fdc 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect-outside.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect-outside.xml
@@ -415,7 +415,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect-standbyloss.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect-standbyloss.xml
index bbe2a2b38..1373591d3 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect-standbyloss.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect-standbyloss.xml
@@ -419,7 +419,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect-with-solar-fraction.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect-with-solar-fraction.xml
index b9085eac4..a5384ac11 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect-with-solar-fraction.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect-with-solar-fraction.xml
@@ -423,7 +423,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-indirect.xml b/hpxml-measures/workflow/sample_files/base-dhw-indirect.xml
index 13c79a78d..28ff927b8 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-indirect.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-indirect.xml
@@ -415,7 +415,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-jacket-electric.xml b/hpxml-measures/workflow/sample_files/base-dhw-jacket-electric.xml
index 483d7a1fd..c9ad9a55c 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-jacket-electric.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-jacket-electric.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-jacket-gas.xml b/hpxml-measures/workflow/sample_files/base-dhw-jacket-gas.xml
index 9848ea40f..2658e49ff 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-jacket-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-jacket-gas.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-jacket-hpwh.xml b/hpxml-measures/workflow/sample_files/base-dhw-jacket-hpwh.xml
index 6b8ed53bf..1074377e2 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-jacket-hpwh.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-jacket-hpwh.xml
@@ -466,7 +466,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-jacket-indirect.xml b/hpxml-measures/workflow/sample_files/base-dhw-jacket-indirect.xml
index 3c6d9e56c..47541a363 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-jacket-indirect.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-jacket-indirect.xml
@@ -420,7 +420,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-low-flow-fixtures.xml b/hpxml-measures/workflow/sample_files/base-dhw-low-flow-fixtures.xml
index 9f6f7994b..969407d78 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-low-flow-fixtures.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-low-flow-fixtures.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-multiple.xml b/hpxml-measures/workflow/sample_files/base-dhw-multiple.xml
index da2712ebd..9d2440ba0 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-multiple.xml
@@ -473,7 +473,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-none.xml b/hpxml-measures/workflow/sample_files/base-dhw-none.xml
index 93aa3c12b..3e63f3076 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-none.xml
@@ -399,7 +399,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand-scheduled.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand-scheduled.xml
index 410668d7b..84ada0ecf 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand-scheduled.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand.xml
index 96e849a7d..9e850a9b2 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-demand.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-manual.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-manual.xml
index 5466913e9..b606f99e9 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-manual.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-manual.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-nocontrol.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-nocontrol.xml
index e4c5e4f66..1de36f1ae 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-nocontrol.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-nocontrol.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-temperature.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-temperature.xml
index edb7b321c..b14e43b29 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-temperature.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-temperature.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-recirc-timer.xml b/hpxml-measures/workflow/sample_files/base-dhw-recirc-timer.xml
index 0513b99ec..2a7ff4889 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-recirc-timer.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-recirc-timer.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-evacuated-tube.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-evacuated-tube.xml
index b001a5723..babc1b6ce 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-evacuated-tube.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-evacuated-tube.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-flat-plate.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-flat-plate.xml
index 6012b847e..d670933d2 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-flat-plate.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-flat-plate.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-ics.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-ics.xml
index dd37e8e43..94d37c641 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-ics.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-direct-ics.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-fraction.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-fraction.xml
index 4687fd272..b2432d2a5 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-fraction.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-fraction.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml
index 76d5e9627..26b549730 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-solar-thermosyphon-flat-plate.xml b/hpxml-measures/workflow/sample_files/base-dhw-solar-thermosyphon-flat-plate.xml
index 1a91f93d4..c562d15b3 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-solar-thermosyphon-flat-plate.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-solar-thermosyphon-flat-plate.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-coal.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-coal.xml
index 0d998bf9f..71d407e0e 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-coal.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-coal.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-detailed-setpoints.xml
index 63a5dbe45..bc6d885bf 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-detailed-setpoints.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-elec-uef.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-elec-uef.xml
index de8b0c664..079ad823e 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-elec-uef.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-elec-uef.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-outside.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-outside.xml
index 63bff7a17..9d14d3d8b 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-outside.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-outside.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef-fhr.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef-fhr.xml
index fd84b30e2..da581e24f 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef-fhr.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef-fhr.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef.xml
index 3b2264790..05979c0b2 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas-uef.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas.xml
index a6a98e6c6..3d9bbe7cd 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-gas.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-detailed-schedules.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-detailed-schedules.xml
index 67d90a724..c430e8ae3 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-detailed-schedules.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-detailed-schedules.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml
index 269133422..e8451736e 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-operating-mode-heat-pump-only.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-outside.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-outside.xml
index 8e1b22476..4f0667d29 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-outside.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-outside.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml
index d4fa2d27f..929df7915 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar-fraction.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar-fraction.xml
index 3eafcd3e1..66db65077 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar-fraction.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar-fraction.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar.xml
index 2558ccf27..3814f3422 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump-with-solar.xml
@@ -476,7 +476,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump.xml
index eb834b3e4..41fd9a0e9 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-heat-pump.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml
index b5f2d4373..a5c98aa1d 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified.xml
index 028d57030..8c005568c 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-model-type-stratified.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-oil.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-oil.xml
index 4c2f40a3d..e1a79857c 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-oil.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-oil.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tank-wood.xml b/hpxml-measures/workflow/sample_files/base-dhw-tank-wood.xml
index f03321a66..8de4d754f 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tank-wood.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tank-wood.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml
index f6b183b6a..898f06e59 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-detailed-setpoints.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-outside.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-outside.xml
index f93a2b223..fc2ca40e9 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-outside.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-outside.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-uef.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-uef.xml
index c1f89dc2c..cf93b27cf 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-uef.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric-uef.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric.xml
index 205b47702..c4c55fbc2 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-electric.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-uef.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-uef.xml
index e50244f8b..912ea6c70 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-uef.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-uef.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml
index 44a50590d..e92d79908 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar-fraction.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar.xml
index c08621dc5..45588944a 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas-with-solar.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas.xml
index ebf2b67a4..68ed6dc23 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-gas.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-dhw-tankless-propane.xml b/hpxml-measures/workflow/sample_files/base-dhw-tankless-propane.xml
index b13df84ee..21ac87d84 100644
--- a/hpxml-measures/workflow/sample_files/base-dhw-tankless-propane.xml
+++ b/hpxml-measures/workflow/sample_files/base-dhw-tankless-propane.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-2stories-garage.xml b/hpxml-measures/workflow/sample_files/base-enclosure-2stories-garage.xml
index 8f2c288bb..651fba3ce 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-2stories-garage.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-2stories-garage.xml
@@ -569,7 +569,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-2stories.xml b/hpxml-measures/workflow/sample_files/base-enclosure-2stories.xml
index 4f7950712..e717df432 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-2stories.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-2stories.xml
@@ -489,7 +489,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-beds-1.xml b/hpxml-measures/workflow/sample_files/base-enclosure-beds-1.xml
index 140b18471..957280d26 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-beds-1.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-beds-1.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-beds-2.xml b/hpxml-measures/workflow/sample_files/base-enclosure-beds-2.xml
index f337dca55..9f35b0635 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-beds-2.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-beds-2.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-beds-4.xml b/hpxml-measures/workflow/sample_files/base-enclosure-beds-4.xml
index d46e283a6..a85b44fc8 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-beds-4.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-beds-4.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-beds-5.xml b/hpxml-measures/workflow/sample_files/base-enclosure-beds-5.xml
index 0567b955c..f226b42e4 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-beds-5.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-beds-5.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-ceilingtypes.xml b/hpxml-measures/workflow/sample_files/base-enclosure-ceilingtypes.xml
index 0ad8be5a2..bbf57fe1a 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-ceilingtypes.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-ceilingtypes.xml
@@ -486,7 +486,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-floortypes.xml b/hpxml-measures/workflow/sample_files/base-enclosure-floortypes.xml
index 7bd1f29da..55c68d06c 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-floortypes.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-floortypes.xml
@@ -429,7 +429,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-garage.xml b/hpxml-measures/workflow/sample_files/base-enclosure-garage.xml
index 5383660af..42bde7314 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-garage.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-garage.xml
@@ -543,7 +543,6 @@
garage
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml
index 749da0a62..5c19c4ead 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml
index 90bc43638..ba7bfd13d 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm50.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm50.xml
index 23da7907f..6512487d8 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm50.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-cfm50.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-ela.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-ela.xml
index 25c2793d3..41b08bbb6 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-ela.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-ela.xml
@@ -458,7 +458,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-flue.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-flue.xml
index 6ff461ec3..8d085527f 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-flue.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-flue.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-ach.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-ach.xml
index 7ba0336bb..33ae95260 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-ach.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-ach.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-cfm.xml b/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-cfm.xml
index 328efa6de..56fe53929 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-cfm.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-infil-natural-cfm.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-orientations.xml b/hpxml-measures/workflow/sample_files/base-enclosure-orientations.xml
index f01ec0147..27db939eb 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-orientations.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-orientations.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-overhangs.xml b/hpxml-measures/workflow/sample_files/base-enclosure-overhangs.xml
index 4d8c41c11..b0d5b1344 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-overhangs.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-overhangs.xml
@@ -482,7 +482,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-rooftypes.xml b/hpxml-measures/workflow/sample_files/base-enclosure-rooftypes.xml
index b71797edf..4b7a9733b 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-rooftypes.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-rooftypes.xml
@@ -600,7 +600,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-physical-properties.xml b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-physical-properties.xml
index d0997d98b..c03575602 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-physical-properties.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-physical-properties.xml
@@ -499,7 +499,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-shading.xml b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-shading.xml
index 6f7d1a08a..8316035f1 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-shading.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-shading.xml
@@ -500,7 +500,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-storms.xml b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-storms.xml
index bad68c83a..f1b91464e 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-skylights-storms.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-skylights-storms.xml
@@ -498,7 +498,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-skylights.xml b/hpxml-measures/workflow/sample_files/base-enclosure-skylights.xml
index f62f55091..af0953320 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-skylights.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-skylights.xml
@@ -490,7 +490,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-split-level.xml b/hpxml-measures/workflow/sample_files/base-enclosure-split-level.xml
index c1fcb00b6..3a91e495e 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-split-level.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-split-level.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-thermal-mass.xml b/hpxml-measures/workflow/sample_files/base-enclosure-thermal-mass.xml
index 570912e86..4182b2b4d 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-thermal-mass.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-thermal-mass.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-walltypes.xml b/hpxml-measures/workflow/sample_files/base-enclosure-walltypes.xml
index 5f8dd9db3..6d5f7544c 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-walltypes.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-walltypes.xml
@@ -775,7 +775,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-natural-ventilation-availability.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-natural-ventilation-availability.xml
index d7cb536b6..2f1505522 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-natural-ventilation-availability.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-natural-ventilation-availability.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-none.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-none.xml
index 2ae299e92..d88277b51 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-none.xml
@@ -404,7 +404,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-physical-properties.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-physical-properties.xml
index 965bed690..42fdede72 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-physical-properties.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-physical-properties.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading-seasons.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading-seasons.xml
index fda3af67b..314dde3d3 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading-seasons.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading-seasons.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading.xml
index 313edabbf..6473fd568 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-shading.xml
@@ -477,7 +477,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-enclosure-windows-storms.xml b/hpxml-measures/workflow/sample_files/base-enclosure-windows-storms.xml
index 47de61044..7f11d66b8 100644
--- a/hpxml-measures/workflow/sample_files/base-enclosure-windows-storms.xml
+++ b/hpxml-measures/workflow/sample_files/base-enclosure-windows-storms.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-ambient.xml b/hpxml-measures/workflow/sample_files/base-foundation-ambient.xml
index c0e287268..bfdeddeee 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-ambient.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-ambient.xml
@@ -403,7 +403,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-basement-garage.xml b/hpxml-measures/workflow/sample_files/base-foundation-basement-garage.xml
index 1f84fb094..42aab74b4 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-basement-garage.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-basement-garage.xml
@@ -550,7 +550,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-no-skirt.xml b/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-no-skirt.xml
index c9c07b070..692cf8ae4 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-no-skirt.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-no-skirt.xml
@@ -405,7 +405,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-skirt.xml b/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-skirt.xml
index 677bbdd68..0825c165a 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-skirt.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-belly-wing-skirt.xml
@@ -405,7 +405,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-complex.xml b/hpxml-measures/workflow/sample_files/base-foundation-complex.xml
index 216d0ff00..2b053bd90 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-complex.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-complex.xml
@@ -562,7 +562,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation-full.xml b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation-full.xml
index 3a3c9aab1..9bf7de8d7 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation-full.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation-full.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml
index ecfdab5df..34436c309 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml
index b00a9274a..5c65fdacc 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-crawlspace.xml b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-crawlspace.xml
index 37c121d68..1f9dea4c5 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-conditioned-crawlspace.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-conditioned-crawlspace.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-multiple.xml b/hpxml-measures/workflow/sample_files/base-foundation-multiple.xml
index 6819e72b1..851fd7a49 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-multiple.xml
@@ -575,7 +575,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-slab.xml b/hpxml-measures/workflow/sample_files/base-foundation-slab.xml
index 99adcb8ec..903f9e3c9 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-slab.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-slab.xml
@@ -417,7 +417,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-above-grade.xml b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-above-grade.xml
index 9294075fe..04f866fc7 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-above-grade.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-above-grade.xml
@@ -511,7 +511,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml
index 7c88ae5fd..161004924 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml
@@ -468,7 +468,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml
index edd11be59..5ede3aab2 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml
@@ -477,7 +477,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement.xml b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement.xml
index 7c5414961..e8848fa6e 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-unconditioned-basement.xml
@@ -476,7 +476,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-unvented-crawlspace.xml b/hpxml-measures/workflow/sample_files/base-foundation-unvented-crawlspace.xml
index a3d67bb81..3bb3e2fbc 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-unvented-crawlspace.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-unvented-crawlspace.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml b/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml
index 1ad843133..fb558e224 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace.xml b/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace.xml
index d0900e835..45b3b60ca 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-vented-crawlspace.xml
@@ -481,7 +481,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-foundation-walkout-basement.xml b/hpxml-measures/workflow/sample_files/base-foundation-walkout-basement.xml
index e8318223f..b60f819a2 100644
--- a/hpxml-measures/workflow/sample_files/base-foundation-walkout-basement.xml
+++ b/hpxml-measures/workflow/sample_files/base-foundation-walkout-basement.xml
@@ -523,7 +523,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml
index 754335e7e..a7ed9a16e 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml
@@ -351,6 +351,9 @@
1.7
1.4
0.9
+ 53000.0
+ 44000.0
+ 28000.0
@@ -467,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml
index 8e479f045..3644a2688 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml
@@ -458,7 +458,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml
index 1c5fbf9b8..52e803dfd 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml
index b30825e47..a5da33760 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
index b39c872b1..97ecc6530 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
@@ -472,7 +472,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml
index 7b8aa4a5c..aa7eabaa0 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml
index a9d6be280..1587283b7 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml
index cf55f5c4f..589b0e614 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-autosize-maxload.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-autosize-maxload.xml
index 759cc40df..ff367c4a1 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-autosize-maxload.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-autosize-maxload.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml
index 4bb9e4cb4..52fa00a0a 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-hvac-seasons.xml
@@ -496,7 +496,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml
index 63fe19801..ffa543996 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler-switchover-temperature.xml
@@ -485,7 +485,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml
index 0857eb82f..7f2c8ed4b 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-boiler.xml
@@ -484,7 +484,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml
index 0d128e62f..64298b058 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace-autosize-factor.xml
@@ -324,10 +324,9 @@
-
+
natural gas
- 60000.0
AFUE
0.8
@@ -335,6 +334,7 @@
200.0
0.9
+ 29000.0
@@ -363,6 +363,8 @@
1.7
1.4
+ 53000.0
+ 44000.0
@@ -374,9 +376,39 @@
-
- baseboard
-
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 75.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 25.0
+ to outside
+
+
+
+
+ supply
+ 4.0
+ attic - unvented
+ 150.0
+
+
+
+ return
+ 0.0
+ attic - unvented
+ 50.0
+
+
@@ -401,14 +433,14 @@
-
+
supply
4.0
attic - unvented
150.0
-
+
return
0.0
attic - unvented
@@ -487,7 +519,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml
index 78441492f..fb7c46b0c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-backup-furnace.xml
@@ -514,7 +514,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml
index 0a8fef775..6fa8d857b 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-autosize.xml
@@ -553,7 +553,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-heating-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-heating-only.xml
index b7b6808da..fe19bd50d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-heating-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-heating-only.xml
@@ -517,7 +517,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-normalized-capacities.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-normalized-capacities.xml
index 3477cf851..317806ca9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-normalized-capacities.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-normalized-capacities.xml
@@ -555,7 +555,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures.xml
index f338803cc..eab541e26 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures.xml
@@ -537,7 +537,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml
index 6cd1dc3af..4b6d22ffc 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml
@@ -555,7 +555,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml
index e727d3d8b..c5b02424f 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml
index 40f341e43..70f115199 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml
@@ -541,7 +541,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule.xml
index 8ba7a67df..c82f1ffca 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml
index 2cf7b098e..f7dd0c7ff 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml b/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
index f3f6f5322..6cdd5c7b9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-autosize-sizing-controls.xml
@@ -479,7 +479,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-autosize.xml
index b49a6ee02..42ed55cfc 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-autosize.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-coal-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-coal-only.xml
index 36ecb038d..4b9b9653a 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-coal-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-coal-only.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-elec-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-elec-only.xml
index 20898d899..28fa78936 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-elec-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-elec-only.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-central-ac-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-central-ac-1-speed.xml
index 51760a70c..c90f9954b 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-central-ac-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-central-ac-1-speed.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only-pilot.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only-pilot.xml
index 4bd0a44f2..1642eb098 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only-pilot.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only-pilot.xml
@@ -422,7 +422,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only.xml
index 802fb9f4d..11a9aed72 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-gas-only.xml
@@ -417,7 +417,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-oil-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-oil-only.xml
index 9fbe63616..84b027514 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-oil-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-oil-only.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-propane-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-propane-only.xml
index 0d586e946..6f042a096 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-propane-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-propane-only.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-boiler-wood-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-boiler-wood-only.xml
index a55112c93..17824f612 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-boiler-wood-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-boiler-wood-only.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-autosize-factor.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-autosize-factor.xml
index 8d0e2a0af..b02bd7c19 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-autosize-factor.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-autosize-factor.xml
@@ -333,6 +333,7 @@
0.73
1.7
+ 37000.0
@@ -448,7 +449,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml
index d09511cee..a3676fc47 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml
index 90e19dd3d..686cdf4bd 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml
index 140ad6d59..b92b426d7 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml
index d5744e285..2bbe83122 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml
@@ -483,7 +483,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance.xml
index ff131bd85..df37397c0 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-detailed-performance.xml
@@ -484,7 +484,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-max-power-ratio-schedule.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-max-power-ratio-schedule.xml
index 48466a632..842a71dc8 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-max-power-ratio-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed-max-power-ratio-schedule.xml
@@ -449,7 +449,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml
index c132758ff..5e04b079c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml
index 1c93890c3..8c4fd60e6 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml
@@ -481,7 +481,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dse.xml b/hpxml-measures/workflow/sample_files/base-hvac-dse.xml
index 9365d923a..3124b82ca 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dse.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dse.xml
@@ -432,7 +432,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
index b5160710a..920f84c41 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml
index e7a73efbe..ab4571e57 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.xml
index 454e365a1..bbabdb039 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-2-speed.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.xml
index 9a6fefcbb..fd763be4a 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-var-speed.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml
index 555a19bc6..e429c086e 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-dual-fuel-mini-split-heat-pump-ducted.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-fractions.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-fractions.xml
index 04a0d35b2..b7fc20109 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-fractions.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-fractions.xml
@@ -490,7 +490,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-multipliers.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-multipliers.xml
index 0ecaed9d6..c68b27c6a 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-multipliers.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-area-multipliers.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-buried.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-buried.xml
index 7424d7639..605a5b82d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-buried.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-buried.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-defaults.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-defaults.xml
index ce8680564..904f3d29d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-defaults.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-defaults.xml
@@ -472,7 +472,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-effective-rvalue.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-effective-rvalue.xml
index 91bb02cd8..4030fca38 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-effective-rvalue.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-effective-rvalue.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml
index 945a49aad..edb1fc4cc 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-percent.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-percent.xml
index ae632ddd5..a44a0a5db 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-percent.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-leakage-percent.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-mixed.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-mixed.xml
index 80b13b2fb..2e85a566b 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-mixed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-mixed.xml
@@ -468,7 +468,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-rectangular.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-rectangular.xml
index ecc03f607..e38220f32 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-rectangular.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-rectangular.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-round.xml b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-round.xml
index 86dae3e9b..2ee656af9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-round.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ducts-shape-round.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-elec-resistance-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-elec-resistance-only.xml
index 6ae4f066d..f6fd025fe 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-elec-resistance-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-elec-resistance-only.xml
@@ -407,7 +407,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-furnace-gas.xml b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-furnace-gas.xml
index a38012775..2afd8acc3 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-furnace-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-furnace-gas.xml
@@ -455,7 +455,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml
index 609738213..627d593db 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml
@@ -434,7 +434,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only.xml
index 90828e1dd..46cf00bc1 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-evap-cooler-only.xml
@@ -401,7 +401,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-fireplace-wood-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-fireplace-wood-only.xml
index feb232bbf..8bba9811c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-fireplace-wood-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-fireplace-wood-only.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml
index 1c19ccf10..e96abf796 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml
@@ -415,7 +415,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-coal-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-coal-only.xml
index c8d343fc9..f8b9d9463 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-coal-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-coal-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-central-ac-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-central-ac-1-speed.xml
index 97952f17e..db5c96c0e 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-central-ac-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-central-ac-1-speed.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-only.xml
index f6678e190..43acfe7d2 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-elec-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml
index f32af86dc..b7e12f1eb 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-2-speed.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed-max-power-ratio-schedule.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed-max-power-ratio-schedule.xml
index 3f915c03c..24b89b54e 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed-max-power-ratio-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed-max-power-ratio-schedule.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml
index da15d4e47..b6b1e767b 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-central-ac-var-speed.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-autosize-factor.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-autosize-factor.xml
index 6e7713c0a..8c1b01683 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-autosize-factor.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-autosize-factor.xml
@@ -333,6 +333,7 @@
1.0
1.4
+ 45000.0
@@ -448,7 +449,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-detailed-setpoints.xml
index 211d5feb5..48f52c985 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-detailed-setpoints.xml
@@ -448,7 +448,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-pilot.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-pilot.xml
index e1c3842fe..d95e32fc0 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-pilot.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only-pilot.xml
@@ -451,7 +451,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only.xml
index 730f4e1ef..c6acf73c3 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-room-ac.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-room-ac.xml
index cc4a4a7bb..099491f80 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-room-ac.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-gas-room-ac.xml
@@ -460,7 +460,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-oil-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-oil-only.xml
index 3a8894af8..15f289eb1 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-oil-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-oil-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-propane-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-propane-only.xml
index 41db42476..2bc8e9209 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-propane-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-propane-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-wood-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-wood-only.xml
index 86a0c94de..b23bf6074 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-wood-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-wood-only.xml
@@ -446,7 +446,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-furnace-x3-dse.xml b/hpxml-measures/workflow/sample_files/base-hvac-furnace-x3-dse.xml
index 13b7d5683..6cca2858a 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-furnace-x3-dse.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-furnace-x3-dse.xml
@@ -476,7 +476,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml
index d77fcb8dd..b32f84eac 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml
@@ -454,7 +454,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
index 436af8eb8..de29fbb15 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-detailed-geothermal-loop.xml
@@ -493,7 +493,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml
index eadbef110..3c0ced3ef 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml
@@ -461,7 +461,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml
index 4cec7aa87..b086c3ac9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml
index 59711d0f0..92e3c1fe4 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml
index ecd239d68..92ac58d90 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-2-speed.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml
index 42dba79e8..bf2e43bc9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed-detailed-performance.xml
@@ -560,7 +560,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml
index edec19384..3cefacf98 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-var-speed.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml
index 89a2eee28..5353f3cde 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml
index 04556bd83..552fa27ae 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-2-speed.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml
index 670136298..e86a131cb 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-var-speed.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-only.xml
index 4f0e462c3..31b466048 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-furnace-gas-only.xml
@@ -450,7 +450,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml
index 8ce720b2f..13f6ea985 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml
@@ -466,7 +466,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml
index 2209092b9..973f9532d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml
@@ -450,7 +450,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml
index 1c3aa8df0..93786959c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml
index 3819ab7e6..11b0b0362 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml
@@ -445,7 +445,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize.xml
index 6b2464f90..fec006615 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance-autosize.xml
@@ -444,7 +444,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml
index bf0ecfe9e..dc65ad029 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless-detailed-performance.xml
@@ -445,7 +445,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml
index 3b10e5872..c8247e07f 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml
@@ -406,7 +406,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml
index de4a1a414..5a336693f 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml
@@ -457,7 +457,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance-autosize.xml
index 6cba39435..72caad6ee 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance-autosize.xml
@@ -553,7 +553,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance.xml
index efa8cd6e0..4c6aaf3c0 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-detailed-performance.xml
@@ -555,7 +555,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only-max-power-ratio-schedule.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only-max-power-ratio-schedule.xml
index ec0ccac46..823d50891 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only-max-power-ratio-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only-max-power-ratio-schedule.xml
@@ -467,7 +467,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml
index 668e1a568..a58c7b93d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-max-power-ratio-schedule.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-max-power-ratio-schedule.xml
index cd96b115c..ce5328a7f 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-max-power-ratio-schedule.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-max-power-ratio-schedule.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml
index 9c3ac762f..23740e724 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml
@@ -466,7 +466,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-autosize-factor.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-autosize-factor.xml
new file mode 100644
index 000000000..f4fff28c4
--- /dev/null
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-autosize-factor.xml
@@ -0,0 +1,511 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+
+ 60
+
+
+
+ Bills
+
+
+
+
+
+
+
+
+
+ CO
+
+
+
+ proposed workscope
+
+
+
+
+ suburban
+ stand-alone
+ no units above or below
+ 180
+
+ electricity
+ natural gas
+
+
+
+ single-family detached
+ 2.0
+ 1.0
+ 8.0
+ 3
+ 2
+ 2700.0
+ 21600.0
+
+
+
+
+ 2006
+ 5B
+
+
+
+ USA_CO_Denver.Intl.AP.725650_TMY3
+
+ USA_CO_Denver.Intl.AP.725650_TMY3.epw
+
+
+
+
+
+
+
+ 50.0
+
+ ACH
+ 3.0
+
+ 21600.0
+
+
+
+
+
+
+
+ false
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+ attic - unvented
+ 1509.3
+ asphalt or fiberglass shingles
+ 0.7
+ 0.92
+ 6.0
+
+
+ 2.3
+
+
+
+
+
+
+ outside
+ basement - conditioned
+ 115.6
+ wood siding
+ 0.7
+ 0.92
+
+
+ 23.0
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 1200.0
+ wood siding
+ 0.7
+ 0.92
+
+ gypsum board
+
+
+
+ 23.0
+
+
+
+
+ outside
+ attic - unvented
+ gable
+
+
+
+ 225.0
+ wood siding
+ 0.7
+ 0.92
+
+
+ 4.0
+
+
+
+
+
+
+ ground
+ basement - conditioned
+ 8.0
+ 1200.0
+ 8.0
+ 7.0
+
+ gypsum board
+
+
+
+
+ continuous - exterior
+ 8.9
+ 0.0
+ 8.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ attic - unvented
+ conditioned space
+ ceiling
+
+
+
+ 1350.0
+
+ gypsum board
+
+
+
+ 39.3
+
+
+
+
+
+
+ basement - conditioned
+ 1350.0
+ 4.0
+ 150.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+
+ 108.0
+ 0
+ 0.33
+ 0.45
+
+
+ 0.7
+ 0.85
+
+ 0.67
+
+
+
+
+ 72.0
+ 90
+ 0.33
+ 0.45
+
+
+ 0.7
+ 0.85
+
+ 0.67
+
+
+
+
+ 108.0
+ 180
+ 0.33
+ 0.45
+
+
+ 0.7
+ 0.85
+
+ 0.67
+
+
+
+
+ 72.0
+ 270
+ 0.33
+ 0.45
+
+
+ 0.7
+ 0.85
+
+ 0.67
+
+
+
+
+
+
+
+ 40.0
+ 180
+ 4.4
+
+
+
+
+
+
+
+
+
+
+
+
+ mini-split
+ electricity
+ 0.73
+ 1.0
+ 1.0
+
+ SEER
+ 19.0
+
+
+ HSPF
+ 10.0
+
+
+
+ 0.6
+ 17.0
+
+ 1.7
+ 1.4
+ 41000.0
+ 33000.0
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ electricity
+ storage water heater
+ conditioned space
+ 40.0
+ 1.0
+ 18767.0
+ 0.95
+ 125.0
+
+
+
+
+
+ 50.0
+
+
+
+ 0.0
+
+
+
+
+ shower head
+ true
+
+
+
+ faucet
+ false
+
+
+
+
+
+
+ conditioned space
+ 1.21
+ 380.0
+ 0.12
+ 1.09
+ 27.0
+ 6.0
+ 3.2
+
+
+
+ conditioned space
+ electricity
+ 3.73
+ true
+ 150.0
+
+
+
+ conditioned space
+ 307.0
+ 12
+ 0.12
+ 1.09
+ 22.32
+ 4.0
+
+
+
+ conditioned space
+ 650.0
+
+
+
+ conditioned space
+ electricity
+ false
+
+
+
+ false
+
+
+
+
+
+ interior
+ 0.4
+
+
+
+
+
+
+ interior
+ 0.1
+
+
+
+
+
+
+ interior
+ 0.25
+
+
+
+
+
+
+ exterior
+ 0.4
+
+
+
+
+
+
+ exterior
+ 0.1
+
+
+
+
+
+
+ exterior
+ 0.25
+
+
+
+
+
+
+
+
+ TV other
+
+ kWh/year
+ 620.0
+
+
+
+
+ other
+
+ kWh/year
+ 2457.0
+
+
+ 0.855
+ 0.045
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml
index 23efc268c..d3d7b0f39 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-baseboard.xml
@@ -434,7 +434,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml
index 3123ae226..e13fc8cad 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace-ducts-defaults.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml
index 21d697de8..40eaf9271 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-furnace.xml
@@ -473,7 +473,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml
index 824e81b8c..139df10e5 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-backup-stove.xml
@@ -437,7 +437,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml
index 8d9be637f..347a37c78 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance-autosize.xml
@@ -507,7 +507,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml
index 923db14ba..275daaf95 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-detailed-performance.xml
@@ -509,7 +509,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml
index 4183f6122..64b82a740 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless-heating-capacity-17f.xml
@@ -415,7 +415,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml
index 8ac2fe37e..001d2f368 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml
@@ -420,7 +420,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-multiple.xml b/hpxml-measures/workflow/sample_files/base-hvac-multiple.xml
index ab73c71cc..82c9c43ec 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-multiple.xml
@@ -843,7 +843,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-none.xml b/hpxml-measures/workflow/sample_files/base-hvac-none.xml
index 8da41aed7..fa099ad11 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-none.xml
@@ -337,7 +337,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml b/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml
index c2ad0be46..fd280430c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml
@@ -414,7 +414,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml b/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml
index b02603fd5..7708e8832 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml
@@ -414,7 +414,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-ptac.xml b/hpxml-measures/workflow/sample_files/base-hvac-ptac.xml
index c85475b20..69eccb1c5 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-ptac.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-ptac.xml
@@ -406,7 +406,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-pthp-heating-capacity-17f.xml b/hpxml-measures/workflow/sample_files/base-hvac-pthp-heating-capacity-17f.xml
index 6cfeb4244..fb8521bce 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-pthp-heating-capacity-17f.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-pthp-heating-capacity-17f.xml
@@ -422,7 +422,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-pthp.xml b/hpxml-measures/workflow/sample_files/base-hvac-pthp.xml
index 942403c00..8e3d8e1e2 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-pthp.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-pthp.xml
@@ -427,7 +427,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-33percent.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-33percent.xml
index 48b7e6e24..e19e9d769 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-33percent.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-33percent.xml
@@ -406,7 +406,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-ceer.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-ceer.xml
index 9a6d9f8b2..324d73498 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-ceer.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-ceer.xml
@@ -406,7 +406,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-detailed-setpoints.xml
index 2371d1f31..c94b869b3 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only-detailed-setpoints.xml
@@ -408,7 +408,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only.xml
index bbef4edbd..5c5ff96d9 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-only.xml
@@ -406,7 +406,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-heating.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-heating.xml
index 0ed6fb16c..5109ed10d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-heating.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-heating.xml
@@ -414,7 +414,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml
index 6f5b930b7..3b38d2f2e 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml
@@ -427,7 +427,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-seasons.xml b/hpxml-measures/workflow/sample_files/base-hvac-seasons.xml
index 71b1ea75c..228ab30d0 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-seasons.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-seasons.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-schedules.xml b/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-schedules.xml
index a2f60b8db..a67fb44e1 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-schedules.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-schedules.xml
@@ -466,7 +466,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-setbacks.xml b/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-setbacks.xml
index 51f5a191f..e05c8e62d 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-setbacks.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-setpoints-daily-setbacks.xml
@@ -470,7 +470,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-setpoints.xml b/hpxml-measures/workflow/sample_files/base-hvac-setpoints.xml
index 406098ecf..fd9dc1504 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-setpoints.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-space-heater-gas-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-space-heater-gas-only.xml
index c28c18bf3..99738be55 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-space-heater-gas-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-space-heater-gas-only.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-stove-oil-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-stove-oil-only.xml
index 7fa1d2518..fc574f0c3 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-stove-oil-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-stove-oil-only.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml
index 5066d74fe..a09abec8c 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-undersized.xml b/hpxml-measures/workflow/sample_files/base-hvac-undersized.xml
index ba8e41d21..057e281ee 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-undersized.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-undersized.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml b/hpxml-measures/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml
index bb3222652..cbc502876 100644
--- a/hpxml-measures/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml
@@ -410,7 +410,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml b/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml
index 27bbb54f1..e5543eac1 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans.xml b/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans.xml
index cb9d595b0..9be8dc3c8 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-ceiling-fans.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-holiday.xml b/hpxml-measures/workflow/sample_files/base-lighting-holiday.xml
index 4ab3c81f3..d4f7bd784 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-holiday.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-holiday.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-kwh-per-year.xml b/hpxml-measures/workflow/sample_files/base-lighting-kwh-per-year.xml
index 3c8f9dacc..4a15c5147 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-kwh-per-year.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-kwh-per-year.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-mixed.xml b/hpxml-measures/workflow/sample_files/base-lighting-mixed.xml
index 5e83c628e..2188cacb2 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-mixed.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-mixed.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-none-ceiling-fans.xml b/hpxml-measures/workflow/sample_files/base-lighting-none-ceiling-fans.xml
index 96dd4a7da..a831bfef7 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-none-ceiling-fans.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-none-ceiling-fans.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-lighting-none.xml b/hpxml-measures/workflow/sample_files/base-lighting-none.xml
index 0ee63f6cb..16dc346f0 100644
--- a/hpxml-measures/workflow/sample_files/base-lighting-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-lighting-none.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-AMY-2012.xml b/hpxml-measures/workflow/sample_files/base-location-AMY-2012.xml
index f13b2d873..63013466e 100644
--- a/hpxml-measures/workflow/sample_files/base-location-AMY-2012.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-AMY-2012.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-baltimore-md.xml b/hpxml-measures/workflow/sample_files/base-location-baltimore-md.xml
index 54bc18e88..559a9ed43 100644
--- a/hpxml-measures/workflow/sample_files/base-location-baltimore-md.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-baltimore-md.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-capetown-zaf.xml b/hpxml-measures/workflow/sample_files/base-location-capetown-zaf.xml
index 3c8fcffe6..25b1cb9f5 100644
--- a/hpxml-measures/workflow/sample_files/base-location-capetown-zaf.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-capetown-zaf.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-dallas-tx.xml b/hpxml-measures/workflow/sample_files/base-location-dallas-tx.xml
index 2ee7c7079..f89e165d5 100644
--- a/hpxml-measures/workflow/sample_files/base-location-dallas-tx.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-dallas-tx.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-detailed.xml b/hpxml-measures/workflow/sample_files/base-location-detailed.xml
index d2be95a01..7e5259b83 100644
--- a/hpxml-measures/workflow/sample_files/base-location-detailed.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-detailed.xml
@@ -472,7 +472,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-duluth-mn.xml b/hpxml-measures/workflow/sample_files/base-location-duluth-mn.xml
index f1c53f00c..0fe6f4bd6 100644
--- a/hpxml-measures/workflow/sample_files/base-location-duluth-mn.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-duluth-mn.xml
@@ -475,7 +475,6 @@
basement - unconditioned
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-helena-mt.xml b/hpxml-measures/workflow/sample_files/base-location-helena-mt.xml
index 2a985a165..b45d89186 100644
--- a/hpxml-measures/workflow/sample_files/base-location-helena-mt.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-helena-mt.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-honolulu-hi.xml b/hpxml-measures/workflow/sample_files/base-location-honolulu-hi.xml
index 44d2c4d11..856819978 100644
--- a/hpxml-measures/workflow/sample_files/base-location-honolulu-hi.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-honolulu-hi.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-miami-fl.xml b/hpxml-measures/workflow/sample_files/base-location-miami-fl.xml
index a193ea60b..c6331b898 100644
--- a/hpxml-measures/workflow/sample_files/base-location-miami-fl.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-miami-fl.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-phoenix-az.xml b/hpxml-measures/workflow/sample_files/base-location-phoenix-az.xml
index 589fa96d8..bf3bcbf98 100644
--- a/hpxml-measures/workflow/sample_files/base-location-phoenix-az.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-phoenix-az.xml
@@ -416,7 +416,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-location-portland-or.xml b/hpxml-measures/workflow/sample_files/base-location-portland-or.xml
index a781074cc..8b286227d 100644
--- a/hpxml-measures/workflow/sample_files/base-location-portland-or.xml
+++ b/hpxml-measures/workflow/sample_files/base-location-portland-or.xml
@@ -481,7 +481,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-balanced.xml b/hpxml-measures/workflow/sample_files/base-mechvent-balanced.xml
index 851205188..aa9707d64 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-balanced.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-balanced.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-bath-kitchen-fans.xml b/hpxml-measures/workflow/sample_files/base-mechvent-bath-kitchen-fans.xml
index b756e3c6a..1df9d3048 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-bath-kitchen-fans.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-bath-kitchen-fans.xml
@@ -490,7 +490,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml
index a192f4ac1..b407e2d50 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml
@@ -481,7 +481,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-dse.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-dse.xml
index c6257b406..d2b3d7fd5 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-dse.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-dse.xml
@@ -448,7 +448,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-evap-cooler-only-ducted.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-evap-cooler-only-ducted.xml
index 1d3850d19..a580ca3e3 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-evap-cooler-only-ducted.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-evap-cooler-only-ducted.xml
@@ -450,7 +450,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml
index cdf83fbb2..86aee35f8 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml
@@ -486,7 +486,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-supply.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-supply.xml
index 21b03c908..66f32265d 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-supply.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis-supplemental-fan-supply.xml
@@ -486,7 +486,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-cfis.xml b/hpxml-measures/workflow/sample_files/base-mechvent-cfis.xml
index b16a40bf9..29b9aa76d 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-cfis.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-cfis.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-erv-atre-asre.xml b/hpxml-measures/workflow/sample_files/base-mechvent-erv-atre-asre.xml
index 432a9daf3..fecda46cf 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-erv-atre-asre.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-erv-atre-asre.xml
@@ -476,7 +476,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-erv.xml b/hpxml-measures/workflow/sample_files/base-mechvent-erv.xml
index 71318c876..3d8ec851b 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-erv.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-erv.xml
@@ -476,7 +476,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-exhaust-rated-flow-rate.xml b/hpxml-measures/workflow/sample_files/base-mechvent-exhaust-rated-flow-rate.xml
index ef8691195..d84bc17e0 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-exhaust-rated-flow-rate.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-exhaust-rated-flow-rate.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-exhaust.xml b/hpxml-measures/workflow/sample_files/base-mechvent-exhaust.xml
index ef8691195..d84bc17e0 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-exhaust.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-exhaust.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-hrv-asre.xml b/hpxml-measures/workflow/sample_files/base-mechvent-hrv-asre.xml
index 987bf2777..ec92b92cc 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-hrv-asre.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-hrv-asre.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-hrv.xml b/hpxml-measures/workflow/sample_files/base-mechvent-hrv.xml
index bc41c3b58..48317f9c2 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-hrv.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-hrv.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-multiple.xml b/hpxml-measures/workflow/sample_files/base-mechvent-multiple.xml
index db279eeda..0065c3ffc 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-multiple.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-multiple.xml
@@ -719,7 +719,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-supply.xml b/hpxml-measures/workflow/sample_files/base-mechvent-supply.xml
index a1c56e2ae..995fdc500 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-supply.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-supply.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-mechvent-whole-house-fan.xml b/hpxml-measures/workflow/sample_files/base-mechvent-whole-house-fan.xml
index 7c5592871..c8d41da1e 100644
--- a/hpxml-measures/workflow/sample_files/base-mechvent-whole-house-fan.xml
+++ b/hpxml-measures/workflow/sample_files/base-mechvent-whole-house-fan.xml
@@ -472,7 +472,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-additional-properties.xml b/hpxml-measures/workflow/sample_files/base-misc-additional-properties.xml
index b7720acf7..065e63677 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-additional-properties.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-additional-properties.xml
@@ -474,7 +474,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-bills-pv-detailed-only.xml b/hpxml-measures/workflow/sample_files/base-misc-bills-pv-detailed-only.xml
index 09d7a0f01..62c2d4ba9 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-bills-pv-detailed-only.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-bills-pv-detailed-only.xml
@@ -515,7 +515,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-bills-pv-mixed.xml b/hpxml-measures/workflow/sample_files/base-misc-bills-pv-mixed.xml
index d6a6b911b..413c15c9e 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-bills-pv-mixed.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-bills-pv-mixed.xml
@@ -497,7 +497,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-bills-pv.xml b/hpxml-measures/workflow/sample_files/base-misc-bills-pv.xml
index 00569ec13..fa2cd58ba 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-bills-pv.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-bills-pv.xml
@@ -560,7 +560,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-bills.xml b/hpxml-measures/workflow/sample_files/base-misc-bills.xml
index 09fc37f68..d0b3aeb5a 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-bills.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-bills.xml
@@ -472,7 +472,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-emissions.xml b/hpxml-measures/workflow/sample_files/base-misc-emissions.xml
index 5d1dcc453..34e8dabc5 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-emissions.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-emissions.xml
@@ -560,7 +560,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-generators-battery-scheduled.xml b/hpxml-measures/workflow/sample_files/base-misc-generators-battery-scheduled.xml
index 6be54c039..f795cf066 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-generators-battery-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-generators-battery-scheduled.xml
@@ -497,7 +497,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-generators-battery.xml b/hpxml-measures/workflow/sample_files/base-misc-generators-battery.xml
index 057deef52..a0c7fc18d 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-generators-battery.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-generators-battery.xml
@@ -494,7 +494,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-generators.xml b/hpxml-measures/workflow/sample_files/base-misc-generators.xml
index c40c94f3b..58c5d00aa 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-generators.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-generators.xml
@@ -478,7 +478,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-ground-conductivity.xml b/hpxml-measures/workflow/sample_files/base-misc-ground-conductivity.xml
index de210aba3..4d4bac8f9 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-ground-conductivity.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-ground-conductivity.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-loads-none.xml b/hpxml-measures/workflow/sample_files/base-misc-loads-none.xml
index dcc401dd1..5ec885cab 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-loads-none.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-loads-none.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml b/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml
index 2bae6749e..943e94b70 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading-bldgtype-multifamily.xml
@@ -420,7 +420,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading.xml b/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading.xml
index 47d7c9360..1fa4385c2 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-neighbor-shading.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-shielding-of-home.xml b/hpxml-measures/workflow/sample_files/base-misc-shielding-of-home.xml
index cb3dffbbf..d2930b0d5 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-shielding-of-home.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-shielding-of-home.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-unit-multiplier.xml b/hpxml-measures/workflow/sample_files/base-misc-unit-multiplier.xml
index 7874c288a..391cc7f4e 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-unit-multiplier.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-unit-multiplier.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-misc-usage-multiplier.xml b/hpxml-measures/workflow/sample_files/base-misc-usage-multiplier.xml
index 340cf4fdf..227fbe0d0 100644
--- a/hpxml-measures/workflow/sample_files/base-misc-usage-multiplier.xml
+++ b/hpxml-measures/workflow/sample_files/base-misc-usage-multiplier.xml
@@ -479,7 +479,6 @@
conditioned space
650.0
- true
0.9
diff --git a/hpxml-measures/workflow/sample_files/base-pv-battery-ah.xml b/hpxml-measures/workflow/sample_files/base-pv-battery-ah.xml
index a7f664fd4..e87ced837 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-battery-ah.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-battery-ah.xml
@@ -506,7 +506,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-battery-garage.xml b/hpxml-measures/workflow/sample_files/base-pv-battery-garage.xml
index 4707f617d..5cb3e6662 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-battery-garage.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-battery-garage.xml
@@ -580,7 +580,6 @@
garage
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-battery-round-trip-efficiency.xml b/hpxml-measures/workflow/sample_files/base-pv-battery-round-trip-efficiency.xml
index 2ba16abf8..55a8b1a16 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-battery-round-trip-efficiency.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-battery-round-trip-efficiency.xml
@@ -507,7 +507,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-battery-scheduled.xml b/hpxml-measures/workflow/sample_files/base-pv-battery-scheduled.xml
index ebc02fe04..e9c09a409 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-battery-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-battery-scheduled.xml
@@ -509,7 +509,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-battery.xml b/hpxml-measures/workflow/sample_files/base-pv-battery.xml
index 9506d6576..681e6bc9a 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-battery.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-battery.xml
@@ -506,7 +506,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-generators-battery-scheduled.xml b/hpxml-measures/workflow/sample_files/base-pv-generators-battery-scheduled.xml
index cfbd0e160..f6928a42e 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-generators-battery-scheduled.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-generators-battery-scheduled.xml
@@ -525,7 +525,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-generators-battery.xml b/hpxml-measures/workflow/sample_files/base-pv-generators-battery.xml
index 657ff5f6a..619834e7a 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-generators-battery.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-generators-battery.xml
@@ -522,7 +522,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv-generators.xml b/hpxml-measures/workflow/sample_files/base-pv-generators.xml
index 56eeed538..13f44d076 100644
--- a/hpxml-measures/workflow/sample_files/base-pv-generators.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv-generators.xml
@@ -506,7 +506,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-pv.xml b/hpxml-measures/workflow/sample_files/base-pv.xml
index 0bfa53b43..9fc450370 100644
--- a/hpxml-measures/workflow/sample_files/base-pv.xml
+++ b/hpxml-measures/workflow/sample_files/base-pv.xml
@@ -490,7 +490,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-residents-0-runperiod-1-month.xml b/hpxml-measures/workflow/sample_files/base-residents-0-runperiod-1-month.xml
index 75f026a6d..0c03c6452 100644
--- a/hpxml-measures/workflow/sample_files/base-residents-0-runperiod-1-month.xml
+++ b/hpxml-measures/workflow/sample_files/base-residents-0-runperiod-1-month.xml
@@ -469,7 +469,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-residents-0.xml b/hpxml-measures/workflow/sample_files/base-residents-0.xml
index 5559ee2de..9b3100941 100644
--- a/hpxml-measures/workflow/sample_files/base-residents-0.xml
+++ b/hpxml-measures/workflow/sample_files/base-residents-0.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-residents-1.xml b/hpxml-measures/workflow/sample_files/base-residents-1.xml
index 33155d517..92e1087a9 100644
--- a/hpxml-measures/workflow/sample_files/base-residents-1.xml
+++ b/hpxml-measures/workflow/sample_files/base-residents-1.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-residents-5.xml b/hpxml-measures/workflow/sample_files/base-residents-5.xml
index 16c70d4d3..748aea7f7 100644
--- a/hpxml-measures/workflow/sample_files/base-residents-5.xml
+++ b/hpxml-measures/workflow/sample_files/base-residents-5.xml
@@ -437,7 +437,6 @@
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-all-10-mins.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-all-10-mins.xml
index ad64e5b68..f460477d8 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-all-10-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-all-10-mins.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps-power-outage.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps-power-outage.xml
index 18b704a50..09131f1e5 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps-power-outage.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps-power-outage.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps.xml
index 0b684bfc7..bea19dd86 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-mixed-timesteps.xml
@@ -464,7 +464,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-10-mins.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-10-mins.xml
index ffc1e366f..6fed15c36 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-10-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-10-mins.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-power-outage.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-power-outage.xml
index 31e53d88f..0aeaab4e2 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-power-outage.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-power-outage.xml
@@ -476,7 +476,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-vacancy.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-vacancy.xml
index 714891142..4da53dc63 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-vacancy.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic-vacancy.xml
@@ -475,7 +475,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic.xml
index b70a07a57..e4ce714ee 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-occupancy-stochastic.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-schedules.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-schedules.xml
index 69952698b..7962559b8 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-schedules.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-schedules.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-setbacks.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-setbacks.xml
index abc283700..ae329a609 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-setbacks.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints-daily-setbacks.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints.xml b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints.xml
index fdd052719..0631c6cba 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-detailed-setpoints.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-simple-power-outage.xml b/hpxml-measures/workflow/sample_files/base-schedules-simple-power-outage.xml
index 9354f6375..f4b2bb851 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-simple-power-outage.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-simple-power-outage.xml
@@ -511,7 +511,6 @@
conditioned space
650.0
- true
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-simple-vacancy.xml b/hpxml-measures/workflow/sample_files/base-schedules-simple-vacancy.xml
index fdf79411e..662f38664 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-simple-vacancy.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-simple-vacancy.xml
@@ -510,7 +510,6 @@
conditioned space
650.0
- true
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
diff --git a/hpxml-measures/workflow/sample_files/base-schedules-simple.xml b/hpxml-measures/workflow/sample_files/base-schedules-simple.xml
index e3c6947bd..2a5e06134 100644
--- a/hpxml-measures/workflow/sample_files/base-schedules-simple.xml
+++ b/hpxml-measures/workflow/sample_files/base-schedules-simple.xml
@@ -500,7 +500,6 @@
conditioned space
650.0
- true
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
0.040, 0.039, 0.038, 0.037, 0.036, 0.036, 0.038, 0.040, 0.041, 0.041, 0.040, 0.040, 0.042, 0.042, 0.042, 0.041, 0.044, 0.048, 0.050, 0.048, 0.047, 0.046, 0.044, 0.041
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-calendar-year-custom.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-calendar-year-custom.xml
index 88a7c3253..34e04daa0 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-calendar-year-custom.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-calendar-year-custom.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-custom.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-custom.xml
index 87fb37d40..150eae9d6 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-custom.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-custom.xml
@@ -471,7 +471,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-disabled.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-disabled.xml
index 91b2c7832..de213e4e3 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-disabled.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-daylight-saving-disabled.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-runperiod-1-month.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-runperiod-1-month.xml
index 5cc4ff0c4..cf5759190 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-runperiod-1-month.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-runperiod-1-month.xml
@@ -517,7 +517,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-temperature-capacitance-multiplier.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-temperature-capacitance-multiplier.xml
index fc8d69d2d..6cbc3a68b 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-temperature-capacitance-multiplier.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-temperature-capacitance-multiplier.xml
@@ -463,7 +463,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml
index 18be44c98..284f11a71 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml
index bf382931c..c3fe2097c 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml
@@ -465,7 +465,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins.xml
index 4e95a96ad..d31446891 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-10-mins.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-30-mins.xml b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-30-mins.xml
index 8dac6719d..220ea2517 100644
--- a/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-30-mins.xml
+++ b/hpxml-measures/workflow/sample_files/base-simcontrol-timestep-30-mins.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/hpxml-measures/workflow/sample_files/base.xml b/hpxml-measures/workflow/sample_files/base.xml
index 6c56e006f..775b81de0 100644
--- a/hpxml-measures/workflow/sample_files/base.xml
+++ b/hpxml-measures/workflow/sample_files/base.xml
@@ -462,7 +462,6 @@
conditioned space
650.0
- true
diff --git a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-02.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3a.xml
similarity index 54%
rename from workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-02.xml
rename to hpxml-measures/workflow/tests/HERS_DSE/HVAC3a.xml
index db20222f8..920413d4b 100644
--- a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-02.xml
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3a.xml
@@ -8,20 +8,11 @@
-
- 2014
-
+ true
-
-
-
- MN
- 00000
-
-
proposed workscope
@@ -30,35 +21,26 @@
stand-alone
no units above or below
-
- electricity
- natural gas
-
+
+ 0.0
+
single-family detached
1.0
1.0
8.0
- 4
+ 3
1539.0
+ 12312.0
-
-
- L100AD-HW-02.xml
-
-
-
- 2006
- 7
-
- Duluth, MN
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
- USA_MN_Duluth.Intl.AP.727450_TMY3.epw
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
@@ -66,10 +48,9 @@
- 50.0
- ACH
- 3.0
+ ACHnatural
+ 0.67
12312.0
@@ -83,9 +64,14 @@
- SLA
- 0.003333
+ ACHnatural
+ 2.4
+
+
+
+
+
@@ -118,6 +104,64 @@
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
@@ -240,10 +284,108 @@
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 0
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 90
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 180
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 270
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
- outside
+ basement - unconditioned
conditioned space
floor
@@ -252,7 +394,7 @@
1539.0
- 14.15
+ 13.85
@@ -274,6 +416,33 @@
+
+
+
+ basement - unconditioned
+ 1539.0
+ 4.0
+ 168.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
@@ -281,8 +450,12 @@
0
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -291,8 +464,12 @@
90
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -301,8 +478,12 @@
180
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -311,8 +492,12 @@
270
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -336,6 +521,10 @@
+
+
+
+
@@ -343,15 +532,14 @@
natural gas
- -1.0
+ 46600.0
AFUE
0.78
1.0
- 0.58
- -0.25
+ 0.5
@@ -359,22 +547,21 @@
central air conditioner
electricity
- -1.0
+ 38400.0
1.0
SEER
- 13.0
+ 10.0
- -0.25
- -0.25
- 0.58
+ 0.5
- manual thermostat
+ 68.0
+ 78.0
@@ -398,182 +585,41 @@
-
+
supply
- 0.0
+ 1.5
conditioned space
308.0
-
+
return
- 0.0
+ 1.5
conditioned space
77.0
- 1
- 1539.0
-
-
-
- natural gas
- storage water heater
- conditioned space
- false
- 40.0
- 1.0
- 0.56
- 0.78
-
-
-
-
-
- 88.46
-
-
-
- 0.0
-
-
-
-
- shower head
- false
-
-
-
- faucet
- false
-
-
-
-
-
- false
- conditioned space
- 0.331
- 704.0
- 0.08
- 0.58
- 23.0
- 999.0
- 2.874
-
-
-
- false
- conditioned space
- electricity
- 2.62
- timer
-
-
-
- false
- conditioned space
- 467.0
- 12
- 999.0
- 999.0
- 999.0
- 999.0
-
-
-
- conditioned space
- 709.0
-
-
-
- conditioned space
- electricity
- false
-
-
-
- false
-
-
-
-
-
- interior
- 0.1
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
\ No newline at end of file
diff --git a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-01.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3b.xml
similarity index 54%
rename from workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-01.xml
rename to hpxml-measures/workflow/tests/HERS_DSE/HVAC3b.xml
index 93b449847..b4a2d102e 100644
--- a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2014_PreAddendumA/L100AD-HW-01.xml
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3b.xml
@@ -8,20 +8,11 @@
-
- 2014
-
+ true
-
-
-
- MN
- 00000
-
-
proposed workscope
@@ -30,35 +21,26 @@
stand-alone
no units above or below
-
- electricity
- natural gas
-
+
+ 0.0
+
single-family detached
1.0
1.0
8.0
- 2
+ 3
1539.0
+ 12312.0
-
-
- L100AD-HW-01.xml
-
-
-
- 2006
- 7
-
- Duluth, MN
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
- USA_MN_Duluth.Intl.AP.727450_TMY3.epw
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
@@ -66,10 +48,9 @@
- 50.0
- ACH
- 3.0
+ ACHnatural
+ 0.67
12312.0
@@ -83,9 +64,14 @@
- SLA
- 0.003333
+ ACHnatural
+ 2.4
+
+
+
+
+
@@ -118,6 +104,64 @@
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
@@ -240,10 +284,108 @@
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 0
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 90
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 180
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 270
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
- outside
+ basement - unconditioned
conditioned space
floor
@@ -252,7 +394,7 @@
1539.0
- 14.15
+ 13.85
@@ -274,6 +416,33 @@
+
+
+
+ basement - unconditioned
+ 1539.0
+ 4.0
+ 168.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
@@ -281,8 +450,12 @@
0
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -291,8 +464,12 @@
90
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -301,8 +478,12 @@
180
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -311,8 +492,12 @@
270
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -336,6 +521,10 @@
+
+
+
+
@@ -343,15 +532,14 @@
natural gas
- -1.0
+ 56000.0
AFUE
0.78
1.0
- 0.58
- -0.25
+ 0.5
@@ -359,22 +547,21 @@
central air conditioner
electricity
- -1.0
+ 38400.0
1.0
SEER
- 13.0
+ 10.0
- -0.25
- -0.25
- 0.58
+ 0.5
- manual thermostat
+ 68.0
+ 78.0
@@ -398,182 +585,41 @@
-
+
supply
- 0.0
- conditioned space
+ 1.5
+ basement - unconditioned
308.0
-
+
return
- 0.0
- conditioned space
+ 1.5
+ basement - unconditioned
77.0
- 1
- 1539.0
-
-
-
- natural gas
- storage water heater
- conditioned space
- false
- 40.0
- 1.0
- 0.56
- 0.78
-
-
-
-
-
- 88.46
-
-
-
- 0.0
-
-
-
-
- shower head
- false
-
-
-
- faucet
- false
-
-
-
-
-
- false
- conditioned space
- 0.331
- 704.0
- 0.08
- 0.58
- 23.0
- 999.0
- 2.874
-
-
-
- false
- conditioned space
- electricity
- 2.62
- timer
-
-
-
- false
- conditioned space
- 467.0
- 12
- 999.0
- 999.0
- 999.0
- 999.0
-
-
-
- conditioned space
- 673.0
-
-
-
- conditioned space
- electricity
- false
-
-
-
- false
-
-
-
-
-
- interior
- 0.1
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_DSE/HVAC3c.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3c.xml
new file mode 100644
index 000000000..d8b10ebcb
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3c.xml
@@ -0,0 +1,625 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 0
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 90
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 180
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 270
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ basement - unconditioned
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 13.85
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ basement - unconditioned
+ 1539.0
+ 4.0
+ 168.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 49000.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38400.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+
+ supply
+ 7.0
+ basement - unconditioned
+ 308.0
+
+
+
+ return
+ 7.0
+ basement - unconditioned
+ 77.0
+
+
+
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_DSE/HVAC3d.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3d.xml
new file mode 100644
index 000000000..7c672e3fa
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3d.xml
@@ -0,0 +1,625 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 42.7
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+ outside
+ basement - unconditioned
+ 20.3
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 5.01
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 0
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 90
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 413.2
+ 180
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+ ground
+ basement - unconditioned
+ 7.25
+ 195.8
+ 270
+ 6.0
+ 6.583
+
+ none
+
+
+
+
+ continuous - exterior
+ 0.0
+
+
+ continuous - interior
+ 0.0
+
+
+
+
+
+
+
+ basement - unconditioned
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 13.85
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ basement - unconditioned
+ 1539.0
+ 4.0
+ 168.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+ 0.0
+ 0.0
+
+
+
+ 0.0
+ 0.0
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 61000.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38400.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 125.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 125.0
+ to outside
+
+
+
+
+ supply
+ 7.0
+ basement - unconditioned
+ 308.0
+
+
+
+ return
+ 7.0
+ basement - unconditioned
+ 77.0
+
+
+
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AM-HW-01.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3e.xml
similarity index 62%
rename from workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AM-HW-01.xml
rename to hpxml-measures/workflow/tests/HERS_DSE/HVAC3e.xml
index 8293a1da9..fe30c8397 100644
--- a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AM-HW-01.xml
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3e.xml
@@ -8,20 +8,11 @@
-
- 2019
-
+ true
-
-
-
- FL
- 00000
-
-
proposed workscope
@@ -30,35 +21,26 @@
stand-alone
no units above or below
-
- electricity
- natural gas
-
+
+ 0.0
+
single-family detached
1.0
1.0
8.0
- 2
+ 3
1539.0
+ 12312.0
-
-
- L100AC.xml
-
-
-
- 2006
- 1A
-
- Miami, FL
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
- USA_FL_Miami.Intl.AP.722020_TMY3.epw
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
@@ -66,10 +48,9 @@
- 50.0
- ACH
- 3.0
+ ACHnatural
+ 0.67
12312.0
@@ -83,9 +64,14 @@
- SLA
- 0.003333
+ ACHnatural
+ 2.4
+
+
+
+
+
@@ -281,8 +267,12 @@
0
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -291,8 +281,12 @@
90
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -301,8 +295,12 @@
180
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -311,8 +309,12 @@
270
1.039
0.67
+
+
+ 1.0
+ 1.0
+
0.0
- residential
@@ -336,6 +338,10 @@
+
+
+
+
@@ -343,15 +349,14 @@
natural gas
- -1.0
+ 46600.0
AFUE
0.78
1.0
- 0.58
- -0.25
+ 0.5
@@ -359,22 +364,21 @@
central air conditioner
electricity
- -1.0
+ 38400.0
1.0
SEER
- 13.0
+ 10.0
- -0.25
- -0.25
- 0.58
+ 0.5
- manual thermostat
+ 68.0
+ 78.0
@@ -398,182 +402,41 @@
-
+
supply
- 0.0
+ 1.5
conditioned space
308.0
-
+
return
- 0.0
+ 1.5
conditioned space
77.0
- 1
- 1539.0
-
-
-
- natural gas
- storage water heater
- conditioned space
- false
- 40.0
- 1.0
- 0.56
- 0.78
-
-
-
-
-
- 88.46
-
-
-
- 0.0
-
-
-
-
- shower head
- false
-
-
-
- faucet
- false
-
-
-
-
-
- false
- conditioned space
- 0.331
- 704.0
- 0.08
- 0.58
- 23.0
- 999.0
- 2.874
-
-
-
- false
- conditioned space
- electricity
- 2.62
- timer
-
-
-
- false
- conditioned space
- 467.0
- 12
- 999.0
- 999.0
- 999.0
- 999.0
-
-
-
- conditioned space
- 673.0
-
-
-
- conditioned space
- electricity
- false
-
-
-
- false
-
-
-
-
-
- interior
- 0.1
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- interior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- exterior
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
-
- garage
- 0.0
-
-
-
-
-
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_DSE/HVAC3f.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3f.xml
new file mode 100644
index 000000000..7c58b3909
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3f.xml
@@ -0,0 +1,442 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 46600.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 49900.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+
+ supply
+ 1.5
+ attic - vented
+ 308.0
+
+
+
+ return
+ 1.5
+ attic - vented
+ 77.0
+
+
+
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_DSE/HVAC3g.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3g.xml
new file mode 100644
index 000000000..44b920f14
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3g.xml
@@ -0,0 +1,442 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 46600.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 42200.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 0.0
+ to outside
+
+
+
+
+ supply
+ 7.0
+ attic - vented
+ 308.0
+
+
+
+ return
+ 7.0
+ attic - vented
+ 77.0
+
+
+
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_DSE/HVAC3h.xml b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3h.xml
new file mode 100644
index 000000000..d8fbff3b7
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_DSE/HVAC3h.xml
@@ -0,0 +1,442 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 46600.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 55000.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+
+ regular velocity
+
+ supply
+
+ CFM25
+ 125.0
+ to outside
+
+
+
+ return
+
+ CFM25
+ 125.0
+ to outside
+
+
+
+
+ supply
+ 7.0
+ attic - vented
+ 308.0
+
+
+
+ return
+ 7.0
+ attic - vented
+ 77.0
+
+
+
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1a.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1a.xml
new file mode 100644
index 000000000..5099a5684
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1a.xml
@@ -0,0 +1,412 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 56100.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38300.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1b.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1b.xml
new file mode 100644
index 000000000..d709802ed
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC1b.xml
@@ -0,0 +1,412 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3
+
+ USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 56100.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38300.0
+ 1.0
+
+ SEER
+ 13.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2a.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2a.xml
new file mode 100644
index 000000000..e5c7b4462
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2a.xml
@@ -0,0 +1,412 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 56100.0
+
+ AFUE
+ 0.78
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38300.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2b.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2b.xml
new file mode 100644
index 000000000..1911cf636
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2b.xml
@@ -0,0 +1,412 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ natural gas
+ 56100.0
+
+ AFUE
+ 0.9
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38300.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2c.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2c.xml
new file mode 100644
index 000000000..bbccca493
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2c.xml
@@ -0,0 +1,408 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+ air-to-air
+ electricity
+ 56100.0
+ 56100.0
+ integrated
+ electricity
+
+ Percent
+ 1.0
+
+ 34121.0
+ 1.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ HSPF
+ 6.8
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2d.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2d.xml
new file mode 100644
index 000000000..bd2227e66
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2d.xml
@@ -0,0 +1,408 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+ air-to-air
+ electricity
+ 56100.0
+ 56100.0
+ integrated
+ electricity
+
+ Percent
+ 1.0
+
+ 34121.0
+ 1.0
+ 1.0
+
+ SEER
+ 13.0
+
+
+ HSPF
+ 9.85
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2e.xml b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2e.xml
new file mode 100644
index 000000000..f5ee24050
--- /dev/null
+++ b/hpxml-measures/workflow/tests/HERS_HVAC/HVAC2e.xml
@@ -0,0 +1,412 @@
+
+
+
+ HPXML
+ tasks.rb
+ 2000-01-01T00:00:00-07:00
+ create
+
+
+
+ true
+
+
+
+
+
+ proposed workscope
+
+
+
+
+ stand-alone
+ no units above or below
+
+
+ 0.0
+
+
+ single-family detached
+ 1.0
+ 1.0
+ 8.0
+ 3
+ 1539.0
+ 12312.0
+
+
+
+
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3
+
+ USA_CO_Colorado.Springs-Peterson.Field.724660_TMY3.epw
+
+
+
+
+
+
+
+
+ ACHnatural
+ 0.67
+
+ 12312.0
+
+
+
+
+
+
+
+ true
+
+
+
+ ACHnatural
+ 2.4
+
+
+
+
+
+
+
+
+
+
+
+ attic - vented
+ 811.1
+ 0
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+ attic - vented
+ 811.1
+ 180
+ asphalt or fiberglass shingles
+ 0.6
+ 0.9
+ 4.0
+
+
+ 1.99
+
+
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 0
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 456.0
+ 180
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ conditioned space
+
+
+
+ 216.0
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+ gypsum board
+ 0.5
+
+
+
+ 11.76
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 90
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+ outside
+ attic - vented
+ gable
+
+
+
+ 60.8
+ 270
+ wood siding
+ 0.6
+ 0.9
+
+
+ 2.15
+
+
+
+
+
+
+ outside
+ conditioned space
+ floor
+
+
+
+ 1539.0
+
+
+ 14.15
+
+
+
+
+ attic - vented
+ conditioned space
+ ceiling
+
+
+
+ 1539.0
+
+ gypsum board
+ 0.5
+
+
+
+ 18.45
+
+
+
+
+
+
+ 90.0
+ 0
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 90
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 90.0
+ 180
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+ 45.0
+ 270
+ 1.039
+ 0.67
+
+
+ 1.0
+ 1.0
+
+ 0.0
+
+
+
+
+
+
+
+ 20.0
+ 180
+ 3.04
+
+
+
+
+ 20.0
+ 0
+ 3.04
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ electricity
+ 56100.0
+
+ AFUE
+ 1.0
+
+ 1.0
+
+ 0.5
+
+
+
+
+
+ central air conditioner
+ electricity
+ 38300.0
+ 1.0
+
+ SEER
+ 10.0
+
+
+ 0.5
+
+
+
+
+
+ 68.0
+ 78.0
+
+
+
+
+ DSE
+
+ 1.0
+ 1.0
+
+
+
+
+
+
+ other
+
+ kWh/year
+ 7302.0
+
+
+ 0.822
+ 0.178
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 0.0203, 0.0203, 0.0203, 0.0203, 0.0203, 0.0339, 0.0426, 0.0852, 0.0497, 0.0304, 0.0304, 0.0406, 0.0304, 0.0254, 0.0264, 0.0264, 0.0386, 0.0416, 0.0447, 0.0700, 0.0700, 0.0731, 0.0731, 0.0660
+ 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
+
+
+
+
+
+
\ No newline at end of file
diff --git a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AD-HW-01.xml b/hpxml-measures/workflow/tests/HERS_Hot_Water/L100AD-HW-01.xml
similarity index 62%
rename from workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AD-HW-01.xml
rename to hpxml-measures/workflow/tests/HERS_Hot_Water/L100AD-HW-01.xml
index 569ab9bf1..afeabc4ef 100644
--- a/workflow/tests/RESNET_Tests/Other_Hot_Water_301_2019_PreAddendumA/L100AD-HW-01.xml
+++ b/hpxml-measures/workflow/tests/HERS_Hot_Water/L100AD-HW-01.xml
@@ -6,22 +6,9 @@
2000-01-01T00:00:00-07:00
create
-
-
-
- 2019
-
-
-
+
-
-
-
- MN
- 00000
-
-
proposed workscope
@@ -30,10 +17,7 @@
stand-alone
no units above or below
-
- electricity
- natural gas
-
+ 180
single-family detached
@@ -42,21 +26,13 @@
8.0
2
1539.0
+ 12312.0
-
-
- L100AC.xml
-
-
-
- 2006
- 7
-
- Duluth, MN
+ USA_MN_Duluth.Intl.AP.727450_TMY3
USA_MN_Duluth.Intl.AP.727450_TMY3.epw
@@ -66,11 +42,7 @@
- 50.0
-
- ACH
- 3.0
-
+ 79.8
12312.0
@@ -82,12 +54,22 @@
true
-
- SLA
- 0.003333
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -95,7 +77,7 @@
811.1
0
asphalt or fiberglass shingles
- 0.6
+ 0.75
0.9
4.0
@@ -109,7 +91,7 @@
811.1
180
asphalt or fiberglass shingles
- 0.6
+ 0.75
0.9
4.0
@@ -129,15 +111,11 @@
456.0
0
wood siding
- 0.6
+ 0.75
0.9
-
- gypsum board
- 0.5
-
- 11.76
+ 17.54
@@ -150,15 +128,11 @@
216.0
90
wood siding
- 0.6
+ 0.75
0.9
-
- gypsum board
- 0.5
-
- 11.76
+ 17.54
@@ -171,15 +145,11 @@
456.0
180
wood siding
- 0.6
+ 0.75
0.9
-
- gypsum board
- 0.5
-
- 11.76
+ 17.54
@@ -192,15 +162,11 @@
216.0
270
wood siding
- 0.6
+ 0.75
0.9
-
- gypsum board
- 0.5
-
- 11.76
+ 17.54
@@ -214,11 +180,11 @@
60.8
90
wood siding
- 0.6
+ 0.75
0.9
- 2.15
+ 4.0
@@ -232,11 +198,11 @@
60.8
270
wood siding
- 0.6
+ 0.75
0.9
- 2.15
+ 4.0
@@ -252,7 +218,7 @@
1539.0
- 14.15
+ 30.3
@@ -264,13 +230,9 @@
1539.0
-
- gypsum board
- 0.5
-
- 18.45
+ 38.46
@@ -279,40 +241,36 @@
90.0
0
- 1.039
- 0.67
+ 0.35
+ 0.4
0.0
- residential
45.0
90
- 1.039
- 0.67
+ 0.35
+ 0.4
0.0
- residential
90.0
180
- 1.039
- 0.67
+ 0.35
+ 0.4
0.0
- residential
45.0
270
- 1.039
- 0.67
+ 0.35
+ 0.4
0.0
- residential
@@ -320,22 +278,19 @@
- 20.0
+ 40.0
180
- 3.04
-
-
-
-
- 20.0
- 0
- 3.04
+ 2.86
+
+
+
+
@@ -343,78 +298,36 @@
natural gas
- -1.0
AFUE
0.78
1.0
-
- 0.58
- -0.25
-
central air conditioner
electricity
- -1.0
1.0
SEER
13.0
-
- -0.25
- -0.25
- 0.58
-
- manual thermostat
+ 68.0
+ 78.0
-
- regular velocity
-
-