From 34389e98152004aa48250995cfa495c78f23011b Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Fri, 6 Sep 2024 11:24:52 -0600 Subject: [PATCH 1/5] First pass on relaxing IECC climate zone requirements. [ci skip] --- Changelog.md | 4 ++ docs/source/workflow_inputs.rst | 9 +++- rulesets/resources/301ruleset.rb | 17 ++++--- rulesets/resources/301validator.xml | 45 ++---------------- rulesets/resources/ES_ZERHruleset.rb | 4 +- rulesets/resources/util.rb | 14 ++++++ rulesets/tests/test_enclosure.rb | 2 +- rulesets/tests/test_es_zerh_enclosure.rb | 20 ++------ rulesets/tests/test_es_zerh_hvac.rb | 16 ++----- rulesets/tests/test_es_zerh_ventilation.rb | 4 +- rulesets/tests/test_ventilation.rb | 18 ++++---- rulesets/tests/test_water_heating.rb | 4 +- rulesets/tests/util.rb | 31 ++----------- tasks.rb | 46 ++++--------------- workflow/real_homes/house001.xml | 12 ----- workflow/real_homes/house002.xml | 8 ---- workflow/real_homes/house003.xml | 8 ---- workflow/real_homes/house004.xml | 8 ---- workflow/real_homes/house005.xml | 12 ----- workflow/real_homes/house006.xml | 8 ---- workflow/real_homes/house007.xml | 12 ----- workflow/real_homes/house008.xml | 8 ---- workflow/real_homes/house009.xml | 8 ---- workflow/real_homes/house010.xml | 8 ---- workflow/real_homes/house011.xml | 12 ----- workflow/real_homes/house012.xml | 8 ---- workflow/real_homes/house013.xml | 8 ---- workflow/real_homes/house014.xml | 8 ---- workflow/real_homes/house015.xml | 8 ---- workflow/real_homes/house016.xml | 8 ---- workflow/real_homes/house017.xml | 8 ---- workflow/real_homes/house018.xml | 8 ---- workflow/real_homes/house019.xml | 8 ---- workflow/real_homes/house020.xml | 8 ---- workflow/real_homes/house021.xml | 8 ---- workflow/real_homes/house022.xml | 8 ---- workflow/real_homes/house023.xml | 8 ---- workflow/real_homes/house024.xml | 8 ---- workflow/real_homes/house025.xml | 8 ---- workflow/real_homes/house026.xml | 8 ---- workflow/real_homes/house027.xml | 8 ---- workflow/real_homes/house028.xml | 8 ---- workflow/real_homes/house029.xml | 8 ---- workflow/real_homes/house030.xml | 8 ---- workflow/real_homes/house031.xml | 8 ---- workflow/real_homes/house032.xml | 8 ---- workflow/real_homes/house033.xml | 8 ---- workflow/real_homes/house034.xml | 8 ---- workflow/real_homes/house035.xml | 8 ---- workflow/real_homes/house036.xml | 8 ---- workflow/real_homes/house037.xml | 8 ---- workflow/real_homes/house038.xml | 8 ---- workflow/real_homes/house039.xml | 8 ---- workflow/real_homes/house040.xml | 8 ---- workflow/real_homes/house041.xml | 8 ---- workflow/real_homes/house042.xml | 8 ---- workflow/real_homes/house043.xml | 8 ---- workflow/real_homes/house044.xml | 8 ---- workflow/real_homes/house045.xml | 8 ---- workflow/real_homes/house046.xml | 8 ---- workflow/real_homes/house047.xml | 8 ---- workflow/real_homes/house048.xml | 4 -- workflow/real_homes/house049.xml | 8 ---- workflow/real_homes/house050.xml | 8 ---- workflow/real_homes/house051.xml | 8 ---- workflow/real_homes/house052.xml | 8 ---- workflow/real_homes/house053.xml | 8 ---- workflow/real_homes/house054.xml | 4 -- workflow/real_homes/house055.xml | 4 -- workflow/real_homes/house056.xml | 8 ---- workflow/real_homes/house057.xml | 8 ---- workflow/real_homes/house058.xml | 4 -- workflow/real_homes/house059.xml | 8 ---- workflow/real_homes/house060.xml | 8 ---- workflow/real_homes/house061.xml | 12 ----- workflow/real_homes/house062.xml | 12 ----- workflow/real_homes/house063.xml | 8 ---- workflow/real_homes/house064.xml | 8 ---- workflow/real_homes/house065.xml | 8 ---- workflow/real_homes/house066.xml | 8 ---- workflow/real_homes/house067.xml | 8 ---- workflow/real_homes/house068.xml | 8 ---- workflow/real_homes/house069.xml | 8 ---- workflow/real_homes/house070.xml | 8 ---- workflow/real_homes/house071.xml | 8 ---- workflow/real_homes/house072.xml | 8 ---- workflow/real_homes/house073.xml | 8 ---- workflow/real_homes/house074.xml | 8 ---- workflow/real_homes/house075.xml | 8 ---- workflow/real_homes/house076.xml | 12 ----- workflow/real_homes/house077.xml | 12 ----- workflow/real_homes/house078.xml | 8 ---- workflow/real_homes/house079.xml | 8 ---- workflow/real_homes/house080.xml | 8 ---- workflow/real_homes/house081.xml | 8 ---- workflow/real_homes/house082.xml | 8 ---- workflow/real_homes/house083.xml | 8 ---- workflow/real_homes/house084.xml | 8 ---- workflow/real_homes/house085.xml | 8 ---- workflow/real_homes/house086.xml | 8 ---- workflow/real_homes/house087.xml | 12 ----- workflow/real_homes/house088.xml | 8 ---- workflow/real_homes/house089.xml | 8 ---- workflow/real_homes/house090.xml | 12 ----- workflow/real_homes/house091.xml | 8 ---- workflow/real_homes/house092.xml | 8 ---- ...e-appliances-dehumidifier-ief-portable.xml | 8 ---- ...appliances-dehumidifier-ief-whole-home.xml | 8 ---- .../base-appliances-dehumidifier-multiple.xml | 8 ---- .../base-appliances-dehumidifier.xml | 8 ---- workflow/sample_files/base-appliances-gas.xml | 8 ---- .../sample_files/base-appliances-modified.xml | 8 ---- .../sample_files/base-appliances-none.xml | 8 ---- workflow/sample_files/base-appliances-oil.xml | 8 ---- .../sample_files/base-appliances-propane.xml | 8 ---- .../sample_files/base-appliances-wood.xml | 8 ---- .../sample_files/base-atticroof-cathedral.xml | 8 ---- .../base-atticroof-conditioned.xml | 8 ---- workflow/sample_files/base-atticroof-flat.xml | 8 ---- .../base-atticroof-radiant-barrier.xml | 8 ---- ...base-atticroof-unvented-insulated-roof.xml | 8 ---- .../sample_files/base-atticroof-vented.xml | 8 ---- workflow/sample_files/base-battery.xml | 8 ---- ...-bldgtype-mf-unit-adjacent-to-multiple.xml | 8 ---- ...-bldgtype-mf-unit-location-portland-or.xml | 8 ---- ...e-mf-unit-shared-boiler-only-baseboard.xml | 8 ---- ...nit-shared-boiler-only-fan-coil-ducted.xml | 8 ---- ...pe-mf-unit-shared-boiler-only-fan-coil.xml | 8 ---- ...hared-boiler-only-water-loop-heat-pump.xml | 8 ---- ...-mf-unit-shared-chiller-only-baseboard.xml | 8 ---- ...it-shared-chiller-only-fan-coil-ducted.xml | 8 ---- ...e-mf-unit-shared-chiller-only-fan-coil.xml | 8 ---- ...ared-chiller-only-water-loop-heat-pump.xml | 8 ---- ...ooling-tower-only-water-loop-heat-pump.xml | 8 ---- ...base-bldgtype-mf-unit-shared-generator.xml | 8 ---- ...ed-ground-loop-ground-to-air-heat-pump.xml | 8 ---- ...ed-laundry-room-multiple-water-heaters.xml | 8 ---- ...e-bldgtype-mf-unit-shared-laundry-room.xml | 8 ---- ...f-unit-shared-mechvent-preconditioning.xml | 8 ---- .../base-bldgtype-mf-unit-shared-mechvent.xml | 8 ---- ...ase-bldgtype-mf-unit-shared-pv-battery.xml | 8 ---- .../base-bldgtype-mf-unit-shared-pv.xml | 8 ---- ...-mf-unit-shared-water-heater-heat-pump.xml | 8 ---- ...ype-mf-unit-shared-water-heater-recirc.xml | 8 ---- ...e-bldgtype-mf-unit-shared-water-heater.xml | 8 ---- .../sample_files/base-bldgtype-mf-unit.xml | 8 ---- .../sample_files/base-bldgtype-sfa-unit.xml | 8 ---- .../sample_files/base-dhw-combi-tankless.xml | 8 ---- .../sample_files/base-dhw-desuperheater.xml | 8 ---- workflow/sample_files/base-dhw-dwhr.xml | 8 ---- .../base-dhw-indirect-standbyloss.xml | 8 ---- workflow/sample_files/base-dhw-jacket-gas.xml | 8 ---- .../sample_files/base-dhw-jacket-hpwh.xml | 8 ---- .../sample_files/base-dhw-jacket-indirect.xml | 8 ---- .../base-dhw-low-flow-fixtures.xml | 8 ---- workflow/sample_files/base-dhw-multiple.xml | 8 ---- workflow/sample_files/base-dhw-none.xml | 8 ---- .../sample_files/base-dhw-recirc-demand.xml | 8 ---- .../sample_files/base-dhw-solar-fraction.xml | 8 ---- .../base-dhw-solar-indirect-flat-plate.xml | 8 ---- .../sample_files/base-dhw-tank-elec-uef.xml | 8 ---- .../sample_files/base-dhw-tank-gas-uef.xml | 8 ---- .../base-dhw-tank-heat-pump-uef.xml | 8 ---- workflow/sample_files/base-dhw-tank-oil.xml | 8 ---- workflow/sample_files/base-dhw-tank-wood.xml | 8 ---- .../base-dhw-tankless-electric-uef.xml | 8 ---- .../base-dhw-tankless-gas-uef.xml | 8 ---- .../base-dhw-tankless-propane.xml | 8 ---- .../base-enclosure-2stories-garage.xml | 8 ---- .../sample_files/base-enclosure-2stories.xml | 8 ---- .../sample_files/base-enclosure-beds-1.xml | 8 ---- .../sample_files/base-enclosure-beds-2.xml | 8 ---- .../sample_files/base-enclosure-beds-4.xml | 8 ---- .../sample_files/base-enclosure-beds-5.xml | 8 ---- .../base-enclosure-ceilingtypes.xml | 8 ---- .../base-enclosure-floortypes.xml | 8 ---- .../sample_files/base-enclosure-garage.xml | 8 ---- ...ase-enclosure-infil-ach-house-pressure.xml | 8 ---- ...ase-enclosure-infil-cfm-house-pressure.xml | 8 ---- .../base-enclosure-infil-cfm50.xml | 8 ---- .../sample_files/base-enclosure-infil-ela.xml | 8 ---- .../base-enclosure-infil-natural-ach.xml | 8 ---- .../base-enclosure-infil-natural-cfm.xml | 8 ---- .../sample_files/base-enclosure-overhangs.xml | 8 ---- .../base-enclosure-skylights-cathedral.xml | 8 ---- .../sample_files/base-enclosure-skylights.xml | 8 ---- .../sample_files/base-enclosure-walltypes.xml | 8 ---- .../sample_files/base-foundation-ambient.xml | 8 ---- .../base-foundation-basement-garage.xml | 8 ---- ...n-conditioned-basement-slab-insulation.xml | 8 ---- ...n-conditioned-basement-wall-insulation.xml | 8 ---- .../sample_files/base-foundation-multiple.xml | 8 ---- .../sample_files/base-foundation-slab.xml | 8 ---- ...tion-unconditioned-basement-assembly-r.xml | 8 ---- ...unconditioned-basement-wall-insulation.xml | 8 ---- ...base-foundation-unconditioned-basement.xml | 8 ---- .../base-foundation-unvented-crawlspace.xml | 8 ---- ...undation-vented-crawlspace-above-grade.xml | 8 ---- .../base-foundation-vented-crawlspace.xml | 8 ---- .../base-foundation-walkout-basement.xml | 8 ---- ...-to-air-heat-pump-1-speed-cooling-only.xml | 8 ---- ...-to-air-heat-pump-1-speed-heating-only.xml | 8 ---- ...heat-pump-1-speed-lockout-temperatures.xml | 8 ---- ...r-to-air-heat-pump-1-speed-seer2-hspf2.xml | 8 ---- ...base-hvac-air-to-air-heat-pump-1-speed.xml | 8 ---- ...base-hvac-air-to-air-heat-pump-2-speed.xml | 8 ---- ...se-hvac-air-to-air-heat-pump-var-speed.xml | 8 ---- .../base-hvac-boiler-elec-only.xml | 8 ---- .../base-hvac-boiler-gas-only.xml | 8 ---- .../base-hvac-boiler-oil-only.xml | 8 ---- .../base-hvac-boiler-propane-only.xml | 8 ---- ...ase-hvac-central-ac-only-1-speed-seer2.xml | 8 ---- .../base-hvac-central-ac-only-1-speed.xml | 8 ---- .../base-hvac-central-ac-only-2-speed.xml | 8 ---- .../base-hvac-central-ac-only-var-speed.xml | 8 ---- ...l-ac-plus-air-to-air-heat-pump-heating.xml | 8 ---- workflow/sample_files/base-hvac-dse.xml | 8 ---- ...heat-pump-1-speed-lockout-temperatures.xml | 8 ---- ...dual-fuel-air-to-air-heat-pump-1-speed.xml | 8 ---- .../base-hvac-ducts-area-fractions.xml | 8 ---- .../sample_files/base-hvac-ducts-buried.xml | 8 ---- .../base-hvac-ducts-leakage-cfm50.xml | 8 ---- .../base-hvac-elec-resistance-only.xml | 8 ---- .../base-hvac-evap-cooler-only-ducted.xml | 8 ---- .../base-hvac-evap-cooler-only.xml | 8 ---- .../base-hvac-fireplace-wood-only.xml | 8 ---- .../base-hvac-floor-furnace-propane-only.xml | 8 ---- .../base-hvac-furnace-elec-only.xml | 8 ---- .../base-hvac-furnace-gas-only.xml | 8 ---- ...c-ground-to-air-heat-pump-cooling-only.xml | 8 ---- ...c-ground-to-air-heat-pump-heating-only.xml | 8 ---- .../base-hvac-ground-to-air-heat-pump.xml | 8 ---- ...l-quality-air-to-air-heat-pump-1-speed.xml | 8 ---- ...quality-furnace-gas-central-ac-1-speed.xml | 8 ---- ...nstall-quality-ground-to-air-heat-pump.xml | 8 ---- ...mini-split-air-conditioner-only-ducted.xml | 8 ---- ...ll-quality-mini-split-heat-pump-ducted.xml | 8 ---- ...mini-split-air-conditioner-only-ducted.xml | 8 ---- ...ni-split-air-conditioner-only-ductless.xml | 8 ---- ...ni-split-heat-pump-ducted-cooling-only.xml | 8 ---- ...ni-split-heat-pump-ducted-heating-only.xml | 8 ---- .../base-hvac-mini-split-heat-pump-ducted.xml | 8 ---- ...ase-hvac-mini-split-heat-pump-ductless.xml | 8 ---- workflow/sample_files/base-hvac-multiple.xml | 8 ---- workflow/sample_files/base-hvac-none.xml | 8 ---- .../base-hvac-programmable-thermostat.xml | 8 ---- ...ase-hvac-ptac-with-heating-electricity.xml | 8 ---- ...ase-hvac-ptac-with-heating-natural-gas.xml | 8 ---- workflow/sample_files/base-hvac-ptac.xml | 8 ---- workflow/sample_files/base-hvac-pthp.xml | 8 ---- .../base-hvac-room-ac-only-ceer.xml | 8 ---- .../sample_files/base-hvac-room-ac-only.xml | 8 ---- .../base-hvac-room-ac-with-heating.xml | 8 ---- .../base-hvac-room-ac-with-reverse-cycle.xml | 8 ---- .../base-hvac-space-heater-gas-only.xml | 8 ---- .../base-hvac-stove-wood-pellets-only.xml | 8 ---- .../sample_files/base-hvac-undersized.xml | 8 ---- .../base-hvac-wall-furnace-elec-only.xml | 8 ---- ...lighting-ceiling-fans-label-energy-use.xml | 8 ---- .../base-lighting-ceiling-fans.xml | 8 ---- .../base-location-baltimore-md.xml | 8 ---- .../base-location-capetown-zaf.xml | 8 ---- .../sample_files/base-location-dallas-tx.xml | 8 ---- .../sample_files/base-location-duluth-mn.xml | 8 ---- .../sample_files/base-location-helena-mt.xml | 8 ---- .../base-location-honolulu-hi.xml | 8 ---- .../sample_files/base-location-miami-fl.xml | 8 ---- .../sample_files/base-location-phoenix-az.xml | 8 ---- .../base-location-portland-or.xml | 8 ---- .../sample_files/base-mechvent-balanced.xml | 8 ---- ...se-mechvent-cfis-airflow-fraction-zero.xml | 8 ---- ...mechvent-cfis-supplemental-fan-exhaust.xml | 8 ---- workflow/sample_files/base-mechvent-cfis.xml | 8 ---- .../base-mechvent-erv-atre-asre.xml | 8 ---- workflow/sample_files/base-mechvent-erv.xml | 8 ---- .../sample_files/base-mechvent-exhaust.xml | 8 ---- .../sample_files/base-mechvent-hrv-asre.xml | 8 ---- workflow/sample_files/base-mechvent-hrv.xml | 8 ---- .../sample_files/base-mechvent-multiple.xml | 8 ---- .../sample_files/base-mechvent-supply.xml | 8 ---- .../base-mechvent-whole-house-fan.xml | 8 ---- .../sample_files/base-misc-generators.xml | 8 ---- workflow/sample_files/base-pv-battery.xml | 8 ---- workflow/sample_files/base-pv.xml | 8 ---- .../base-version-co2-2019ABCD.xml | 8 ---- .../sample_files/base-version-co2-2022.xml | 8 ---- .../sample_files/base-version-co2-2022C.xml | 8 ---- .../sample_files/base-version-eri-2014.xml | 8 ---- .../sample_files/base-version-eri-2014A.xml | 8 ---- .../sample_files/base-version-eri-2014AE.xml | 8 ---- .../sample_files/base-version-eri-2014AEG.xml | 8 ---- .../sample_files/base-version-eri-2019.xml | 8 ---- .../sample_files/base-version-eri-2019A.xml | 8 ---- .../sample_files/base-version-eri-2019AB.xml | 8 ---- .../sample_files/base-version-eri-2019ABC.xml | 8 ---- .../base-version-eri-2019ABCD.xml | 8 ---- .../sample_files/base-version-eri-2022.xml | 8 ---- .../sample_files/base-version-eri-2022C.xml | 8 ---- .../base-version-iecc-eri-2015.xml | 12 ----- .../base-version-iecc-eri-2018.xml | 12 ----- .../base-version-iecc-eri-2021.xml | 8 ---- .../base-version-iecc-eri-2024.xml | 8 ---- workflow/sample_files/base.xml | 8 ---- .../MFNCv12_CZ2_FL_gas_ground_corner_slab.xml | 4 -- .../MFNCv12_CZ4_MO_gas_top_corner.xml | 4 -- .../MFNCv12_CZ6_VT_elec_middle_interior.xml | 4 -- .../SFNHv32_CZ2_FL_gas_slab.xml | 4 -- .../SFNHv32_CZ4_MO_gas_vented_crawl.xml | 4 -- .../SFNHv32_CZ6_VT_elec_cond_bsmt.xml | 4 -- 309 files changed, 72 insertions(+), 2530 deletions(-) create mode 100644 rulesets/resources/util.rb diff --git a/Changelog.md b/Changelog.md index ae31dc846..e9fda35c9 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,10 @@ __New Features__ - Adds 2024 IECC ERI pathway calculation. - **Breaking change**: Renamed `Emissions: : RESNET: XXX` to `Emissions: : ANSI301: XXX` in Annual Home CSV output files. - Adds inputs for modeling skylight curbs and/or shafts. +- Relaxes IECC climate zone requirements. + - Providing only a single IECC climate zone (of any year) is now allowed. + - For programs that use specific IECC climate zone years (e.g., 2021 for ZERH SF 2.0), that year is used if provided in the HPXML, otherwise the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. + - See [the documentation](https://openstudio-eri.readthedocs.io/en/latest/workflow_inputs.html#hpxml-climate-zones) for more information. __Bugfixes__ - Adds error-checking for `NumberofConditionedFloorsAboveGrade`=0, which is not allowed per the documentation. diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst index 4081b8bec..c5195ade8 100644 --- a/docs/source/workflow_inputs.rst +++ b/docs/source/workflow_inputs.rst @@ -177,8 +177,13 @@ One or more IECC climate zones are each entered as a ``/HPXML/Building/BuildingD ================================= ======== ===== =========== ======== ======== =============== .. [#] Year choices are 2003, 2006, 2009, 2012, 2015, 2018, 2021, or 2024. - .. [#] The IECC climate zone for 2006 is always required. - Additional climate zones of other years may be required based on the programs selected for calculation: + .. [#] At least one IECC climate zone is required. + The following climate zone years will be used based on the programs selected for calculation. + If the year cannot be found, the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. + + \- **ERI**: 2006 + + \- **CO2 Index**: 2006 \- **IECC ERI 2015**: 2015 diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb index 99fdbe5f6..b9641728d 100644 --- a/rulesets/resources/301ruleset.rb +++ b/rulesets/resources/301ruleset.rb @@ -338,7 +338,7 @@ def self.set_summary_iad(orig_bldg, new_bldg) def self.set_climate(orig_bldg, new_bldg) # Always use 2006 IECC climate zone for ERI calculation - climate_zone_iecc = orig_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == 2006 }[0] + climate_zone_iecc = get_climate_zone_of_year(orig_bldg, 2006) new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: climate_zone_iecc.year, zone: climate_zone_iecc.zone) new_bldg.climate_and_risk_zones.weather_station_id = orig_bldg.climate_and_risk_zones.weather_station_id @@ -1113,14 +1113,14 @@ def self.set_enclosure_doors_reference(orig_bldg, new_bldg) end if exterior_area > 0.1 new_bldg.doors.add(id: 'ExteriorDoorArea', - attached_to_wall_idref: new_bldg.walls.select { |w| w.is_exterior_thermal_boundary }[0].id, + attached_to_wall_idref: new_bldg.walls.find { |w| w.is_exterior_thermal_boundary }.id, area: exterior_area, azimuth: azimuth, r_value: (1.0 / ufactor).round(3)) end if interior_area > 0.1 new_bldg.doors.add(id: 'InteriorDoorArea', - attached_to_wall_idref: new_bldg.walls.select { |w| w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit }[0].id, + attached_to_wall_idref: new_bldg.walls.find { |w| w.exterior_adjacent_to == HPXML::LocationOtherHousingUnit }.id, area: interior_area, azimuth: azimuth, r_value: (1.0 / ufactor).round(3)) @@ -1153,7 +1153,7 @@ def self.set_enclosure_doors_iad(orig_bldg, new_bldg) end if exterior_area + interior_area > 0.1 new_bldg.doors.add(id: 'DoorArea', - attached_to_wall_idref: new_bldg.walls.select { |w| w.is_exterior_thermal_boundary }[0].id, + attached_to_wall_idref: new_bldg.walls.find { |w| w.is_exterior_thermal_boundary }.id, area: exterior_area + interior_area, azimuth: azimuth, r_value: avg_r_value.round(3)) @@ -1198,7 +1198,7 @@ def self.set_systems_hvac_reference(orig_bldg, new_bldg, is_all_electric: false) if heating_system.distribution_system.hydronic_type == HPXML::HydronicTypeWaterLoop # Maintain same fractions of heating load between boiler and heat pump # 301-2019 Section 4.4.7.2.1 - orig_wlhp = orig_bldg.heat_pumps.select { |hp| hp.heat_pump_type == HPXML::HVACTypeHeatPumpWaterLoopToAir }[0] + orig_wlhp = orig_bldg.heat_pumps.find { |hp| hp.heat_pump_type == HPXML::HVACTypeHeatPumpWaterLoopToAir } hp_fraction_heat_load_served = fraction_heat_load_served * (1.0 / orig_wlhp.heating_efficiency_cop) add_reference_heat_pump(orig_bldg, new_bldg, hp_fraction_heat_load_served, 0.0, orig_htg_system: orig_wlhp) fraction_heat_load_served *= (1.0 - 1.0 / orig_wlhp.heating_efficiency_cop) @@ -1513,7 +1513,7 @@ def self.set_systems_mechanical_ventilation_reference(orig_bldg, new_bldg, iecc_ sum_fan_w = 0.0 sum_fan_cfm = 0.0 q_fans.each do |fan_id, flow_rate| - orig_vent_fan = mech_vent_fans.select { |f| f.id == fan_id }[0] + orig_vent_fan = mech_vent_fans.find { |f| f.id == fan_id } if [HPXML::MechVentTypeERV, HPXML::MechVentTypeHRV].include? orig_vent_fan.fan_type sum_fan_w += (1.00 * flow_rate) elsif orig_vent_fan.is_balanced @@ -1737,8 +1737,7 @@ def self.set_systems_water_heater_reference(orig_bldg, new_bldg, is_all_electric # If 2022, reference WH is in default location, regardless of rated home location if Constants::ERIVersions.index(@eri_version) >= Constants::ERIVersions.index('2022') - climate_zone_iecc = orig_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == 2006 }[0] - location = Waterheater.get_default_location(orig_bldg, climate_zone_iecc) + location = Waterheater.get_default_location(orig_bldg, @iecc_zone) else location = orig_water_heater.location end @@ -2488,7 +2487,7 @@ def self.calc_rated_home_q_fans_by_system(orig_bldg, all_mech_vent_fans) all_mech_vent_fans.each do |orig_vent_fan| next unless orig_vent_fan.is_cfis_supplemental_fan - parent_cfis_fan = all_mech_vent_fans.select { |f| f.cfis_supplemental_fan_idref == orig_vent_fan.id }[0] + parent_cfis_fan = all_mech_vent_fans.find { |f| f.cfis_supplemental_fan_idref == orig_vent_fan.id } q_fans[orig_vent_fan.id] = q_fans[parent_cfis_fan.id] end diff --git a/rulesets/resources/301validator.xml b/rulesets/resources/301validator.xml index e98dcda31..aa3765e9a 100644 --- a/rulesets/resources/301validator.xml +++ b/rulesets/resources/301validator.xml @@ -11,11 +11,11 @@ Expected 0 or 1 element(s) for xpath: SoftwareInfo/extension/CO2IndexCalculation/Version Expected SoftwareInfo/extension/CO2IndexCalculation/Version to be 'latest' or '2022C' or '2022' or '2019ABCD' Expected 0 or 1 element(s) for xpath: SoftwareInfo/extension/IECCERICalculation/Version - Expected SoftwareInfo/extension/IECCERICalculation/Version to be '2024' or '2021' or '2018' or '2015' + Expected SoftwareInfo/extension/IECCERICalculation/Version to be '2024' or '2021' or '2018' or '2015' Expected 0 or 1 element(s) for xpath: SoftwareInfo/extension/EnergyStarCalculation/Version Expected SoftwareInfo/extension/EnergyStarCalculation/Version to be 'SF_National_3.0' or 'SF_National_3.1' or 'SF_National_3.2' or 'SF_Pacific_3.0' or 'SF_Florida_3.1' or 'SF_OregonWashington_3.2' or 'MF_National_1.0' or 'MF_National_1.1' or 'MF_National_1.2' or 'MF_OregonWashington_1.2' Expected 0 or 1 element(s) for xpath: SoftwareInfo/extension/ZERHCalculation/Version - Expected SoftwareInfo/extension/ZERHCalculation/Version to be '1.0' or 'SF_2.0' or 'MF_2.0' + Expected SoftwareInfo/extension/ZERHCalculation/Version to be '1.0' or 'SF_2.0' or 'MF_2.0' Expected 1 element(s) for xpath: Building @@ -28,34 +28,6 @@ - - [IECC=2024] - - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2024"]/ClimateZone - - - - - [IECC=2021] - - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone - - - - - [IECC=2018] - - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2018"]/ClimateZone - - - - - [IECC=2015] - - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2015"]/ClimateZone - - - [EnergyStar=SFNational30] @@ -74,7 +46,6 @@ [EnergyStar=SFNational32] Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]] - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone @@ -120,7 +91,6 @@ [EnergyStar=MFNational12] Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]] - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone @@ -132,18 +102,10 @@ - - [ZERH=1.0] - - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2015"]/ClimateZone - - - [ZERH=SF_2.0] Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]] - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone @@ -151,7 +113,6 @@ [ZERH=MF_2.0] Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]] - Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone @@ -168,7 +129,7 @@ Expected 1 element(s) for xpath: BuildingSummary/Site Expected 1 element(s) for xpath: BuildingSummary/BuildingConstruction - Expected 1 element(s) for xpath: ClimateandRiskZones/ClimateZoneIECC[Year="2006"]/ClimateZone + Expected 1 or more element(s) for xpath: ClimateandRiskZones/ClimateZoneIECC[Year]/ClimateZone Expected 1 element(s) for xpath: ClimateandRiskZones/WeatherStation Expected 1 element(s) for xpath: Enclosure/AirInfiltration/AirInfiltrationMeasurement[BuildingAirLeakage/AirLeakage | EffectiveLeakageArea] Expected 0 or more element(s) for xpath: Enclosure/Attics/Attic diff --git a/rulesets/resources/ES_ZERHruleset.rb b/rulesets/resources/ES_ZERHruleset.rb index 65b4761b0..4ad596994 100644 --- a/rulesets/resources/ES_ZERHruleset.rb +++ b/rulesets/resources/ES_ZERHruleset.rb @@ -22,7 +22,7 @@ def self.apply_ruleset(hpxml, calc_type, lookup_program_data) # Use Year=2006 for Reference Home configuration iecc_climate_zone_year = 2006 end - @iecc_zone = hpxml.buildings[0].climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == iecc_climate_zone_year }[0].zone + @iecc_zone = get_climate_zone_of_year(hpxml.buildings[0], iecc_climate_zone_year) @lookup_program_data = lookup_program_data # Update HPXML object based on ESRD configuration @@ -154,7 +154,7 @@ def self.set_summary_reference(orig_bldg, new_bldg) def self.set_climate(orig_bldg, new_bldg) # Set 2006 IECC zone for downstream ERI calculation - climate_zone_iecc = orig_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == 2006 }[0] + climate_zone_iecc = get_climate_zone_of_year(orig_bldg, 2006) new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: climate_zone_iecc.year, zone: climate_zone_iecc.zone) new_bldg.climate_and_risk_zones.weather_station_id = orig_bldg.climate_and_risk_zones.weather_station_id diff --git a/rulesets/resources/util.rb b/rulesets/resources/util.rb new file mode 100644 index 000000000..eeea2d486 --- /dev/null +++ b/rulesets/resources/util.rb @@ -0,0 +1,14 @@ +def get_climate_zone_of_year(hpxml_bldg, iecc_year) + # Returns the climate zone of the given year; if not found + # uses an earlier year with the assumption that the climate zone + # has not changed. + year = iecc_year + while year >= 2003 + climate_zone_iecc = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.find { |z| z.year == year } + if not climate_zone_iecc.nil? + return climate_zone_iecc + end + year -= 3 + end + return nil +end \ No newline at end of file diff --git a/rulesets/tests/test_enclosure.rb b/rulesets/tests/test_enclosure.rb index d6987ef2c..559f2dcb4 100644 --- a/rulesets/tests/test_enclosure.rb +++ b/rulesets/tests/test_enclosure.rb @@ -92,7 +92,7 @@ def test_enclosure_infiltration hpxml_name = 'base-mechvent-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.tested_flow_rate = nil vent_fan.flow_rate_not_tested = true vent_fan.hours_in_operation = 1 diff --git a/rulesets/tests/test_es_zerh_enclosure.rb b/rulesets/tests/test_es_zerh_enclosure.rb index d6000cafc..1f3b0a75a 100644 --- a/rulesets/tests/test_es_zerh_enclosure.rb +++ b/rulesets/tests/test_es_zerh_enclosure.rb @@ -123,9 +123,7 @@ def test_enclosure_roofs _convert_to_es_zerh('base.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -304,9 +302,7 @@ def test_enclosure_foundation_walls _convert_to_es_zerh(hpxml_name, program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -472,9 +468,7 @@ def test_enclosure_floors _convert_to_es_zerh('base-foundation-unconditioned-basement.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -524,9 +518,7 @@ def test_enclosure_slabs _convert_to_es_zerh('base-foundation-slab.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -674,9 +666,7 @@ def test_enclosure_windows _convert_to_es_zerh('base.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) diff --git a/rulesets/tests/test_es_zerh_hvac.rb b/rulesets/tests/test_es_zerh_hvac.rb index b7944f8d8..3b3915205 100644 --- a/rulesets/tests/test_es_zerh_hvac.rb +++ b/rulesets/tests/test_es_zerh_hvac.rb @@ -378,9 +378,7 @@ def test_elec_resistance _convert_to_es_zerh('base-hvac-elec-resistance-only.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '7' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '7' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Duluth, MN' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 727450 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -444,9 +442,7 @@ def test_air_source_heat_pump _convert_to_es_zerh(hpxml_name, program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '7' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '7' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Duluth, MN' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 727450 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -568,9 +564,7 @@ def test_ground_source_heat_pump _convert_to_es_zerh('base-hvac-ground-to-air-heat-pump.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '7' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '7' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Duluth, MN' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 727450 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -1491,9 +1485,7 @@ def test_shared_ground_loop_ground_source _convert_to_es_zerh(hpxml_name, program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '7' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '7' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Duluth, MN' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 727450 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) diff --git a/rulesets/tests/test_es_zerh_ventilation.rb b/rulesets/tests/test_es_zerh_ventilation.rb index c22d90992..b0639437c 100644 --- a/rulesets/tests/test_es_zerh_ventilation.rb +++ b/rulesets/tests/test_es_zerh_ventilation.rb @@ -171,9 +171,7 @@ def test_mech_vent_attached_housing_location_miami_fl _convert_to_es_zerh('base-bldgtype-mf-unit.xml', program_version) hpxml = HPXML.new(hpxml_path: @tmp_hpxml_path) hpxml_bldg = hpxml.buildings[0] - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) diff --git a/rulesets/tests/test_ventilation.rb b/rulesets/tests/test_ventilation.rb index 3e504f6ce..8d417deb3 100644 --- a/rulesets/tests/test_ventilation.rb +++ b/rulesets/tests/test_ventilation.rb @@ -172,7 +172,7 @@ def test_mech_vent_exhaust_below_ashrae_622 hpxml_name = 'base-mechvent-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.hours_in_operation = 12 hpxml_name = File.basename(@tmp_hpxml_path) XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -226,7 +226,7 @@ def test_mech_vent_exhaust_defaulted_fan_power hpxml_name = 'base-mechvent-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.fan_power = nil vent_fan.fan_power_defaulted = true vent_fan.hours_in_operation = 12 @@ -283,7 +283,7 @@ def test_mech_vent_exhaust_unmeasured_airflow_rate hpxml_name = 'base-mechvent-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.tested_flow_rate = nil vent_fan.flow_rate_not_tested = true vent_fan.hours_in_operation = 24 @@ -339,7 +339,7 @@ def test_mech_vent_exhaust_unmeasured_airflow_rate_and_defaulted_fan_power hpxml_name = 'base-mechvent-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.fan_power = nil vent_fan.fan_power_defaulted = true vent_fan.tested_flow_rate = nil @@ -666,7 +666,7 @@ def test_mech_vent_cfis_unmeasured_airflow_rate_and_defaulted_fan_power hpxml_name = 'base-mechvent-cfis.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation } vent_fan.fan_power = nil vent_fan.fan_power_defaulted = true vent_fan.tested_flow_rate = nil @@ -684,7 +684,7 @@ def test_mech_vent_cfis_unmeasured_airflow_rate_and_defaulted_fan_power hpxml_name = 'base-mechvent-cfis-supplemental-fan-exhaust.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan_suppl = hpxml_bldg.ventilation_fans.select { |vf| vf.is_cfis_supplemental_fan }[0] + vent_fan_suppl = hpxml_bldg.ventilation_fans.find { |vf| vf.is_cfis_supplemental_fan } vent_fan_suppl.fan_power = nil vent_fan_suppl.fan_power_defaulted = true vent_fan_suppl.tested_flow_rate = nil @@ -1035,7 +1035,7 @@ def test_mech_vent_shared_defaulted_fan_power hpxml_name = 'base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system } vent_fan.fan_power = nil vent_fan.fan_power_defaulted = true hpxml_name = File.basename(@tmp_hpxml_path) @@ -1060,7 +1060,7 @@ def test_mech_vent_shared_unmeasured_airflow_rate hpxml_name = 'base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system } vent_fan.in_unit_flow_rate = nil vent_fan.flow_rate_not_tested = true hpxml_name = File.basename(@tmp_hpxml_path) @@ -1085,7 +1085,7 @@ def test_mech_vent_shared_unmeasured_airflow_rate_and_defaulted_fan_power hpxml_name = 'base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml' hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] - vent_fan = hpxml_bldg.ventilation_fans.select { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system }[0] + vent_fan = hpxml_bldg.ventilation_fans.find { |vf| vf.used_for_whole_building_ventilation && vf.is_shared_system } vent_fan.fan_power = nil vent_fan.fan_power_defaulted = true vent_fan.in_unit_flow_rate = nil diff --git a/rulesets/tests/test_water_heating.rb b/rulesets/tests/test_water_heating.rb index 793715adc..6a335ee57 100644 --- a/rulesets/tests/test_water_heating.rb +++ b/rulesets/tests/test_water_heating.rb @@ -330,8 +330,8 @@ def test_multiple_water_heating hpxml_bldg.water_heating_systems.each do |w| w.fraction_dhw_load_served = 0.0 end - hpxml_bldg.water_heating_systems.select { |w| w.fuel_type == HPXML::FuelTypeElectricity }[0].fraction_dhw_load_served = 0.5 - hpxml_bldg.water_heating_systems.select { |w| w.fuel_type == HPXML::FuelTypeNaturalGas }[0].fraction_dhw_load_served = 0.5 + hpxml_bldg.water_heating_systems.find { |w| w.fuel_type == HPXML::FuelTypeElectricity }.fraction_dhw_load_served = 0.5 + hpxml_bldg.water_heating_systems.find { |w| w.fuel_type == HPXML::FuelTypeNaturalGas }.fraction_dhw_load_served = 0.5 hpxml_name = File.basename(@tmp_hpxml_path) XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) diff --git a/rulesets/tests/util.rb b/rulesets/tests/util.rb index 7dc46dd84..03b917395 100644 --- a/rulesets/tests/util.rb +++ b/rulesets/tests/util.rb @@ -28,10 +28,6 @@ def _change_iecc_version(hpxml_name, version) hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) hpxml_bldg = hpxml.buildings[0] hpxml.header.iecc_eri_calculation_version = version - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == Integer(version) }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: Integer(version), - zone: hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone) - end hpxml_name = File.basename(@tmp_hpxml_path) XMLHelper.write_file(hpxml.to_doc, @tmp_hpxml_path) @@ -54,34 +50,26 @@ def convert_to_es_zerh(hpxml_name, program_version, root_path, tmp_hpxml_path, s # Change weather station for regional ENERGY STAR if [ESConstants::SFPacificVer3_0].include? program_version if ['HI'].include?(state_code) || state_code.nil? # if state_code isn't provided, default to HI - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_id = 'WeatherStation' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Honolulu, HI' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 911820 hpxml_bldg.state_code = 'HI' elsif ['GU', 'MP'].include? state_code # For Northern Mariana Islands, use Guam weather - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_id = 'WeatherStation' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Andersen_Afb, GU' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 912180 hpxml_bldg.state_code = 'GU' end elsif [ESConstants::SFFloridaVer3_1].include? program_version - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '1A' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '1A' hpxml_bldg.climate_and_risk_zones.weather_station_id = 'WeatherStation' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Miami, FL' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 722020 hpxml_bldg.state_code = 'FL' elsif [ESConstants::SFOregonWashingtonVer3_2, ESConstants::MFOregonWashingtonVer1_2].include? program_version - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.each do |climate_zone_iecc| - climate_zone_iecc.zone = '4C' - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone = '4C' hpxml_bldg.climate_and_risk_zones.weather_station_id = 'WeatherStation' hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Portland, OR' hpxml_bldg.climate_and_risk_zones.weather_station_wmo = 726980 @@ -118,17 +106,6 @@ def convert_to_es_zerh(hpxml_name, program_version, root_path, tmp_hpxml_path, s insulation_assembly_r_value: 99) end - # Change climate zone year if needed - if program_version == ZERHConstants::Ver1 - iecc_climate_zone_year = 2015 - else - iecc_climate_zone_year = 2021 - end - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == iecc_climate_zone_year }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: iecc_climate_zone_year, - zone: hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone) - end - # Save new file XMLHelper.write_file(hpxml.to_doc, tmp_hpxml_path) end diff --git a/tasks.rb b/tasks.rb index dec881cf9..091197d13 100644 --- a/tasks.rb +++ b/tasks.rb @@ -361,34 +361,24 @@ def set_hpxml_climate_and_risk_zones(hpxml_file, hpxml_bldg) end elsif hpxml_file.include?('EPA_Tests') hpxml_bldg.climate_and_risk_zones.weather_station_id = 'WeatherStation' - years = [2006] - if hpxml_file.include?('SF_National_3.2') || hpxml_file.include?('MF_National_1.2') - years << 2021 - end if hpxml_file.include?('CZ2') hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.clear - years.each do |year| - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: year, - zone: '2A') - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, + zone: '2A') hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Tampa, FL' hpxml_bldg.climate_and_risk_zones.weather_station_epw_filepath = 'USA_FL_Tampa.Intl.AP.722110_TMY3.epw' hpxml_bldg.state_code = 'FL' elsif hpxml_file.include?('CZ4') hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.clear - years.each do |year| - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: year, - zone: '4A') - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, + zone: '4A') hpxml_bldg.climate_and_risk_zones.weather_station_name = 'St Louis, MO' hpxml_bldg.climate_and_risk_zones.weather_station_epw_filepath = 'USA_MO_St.Louis-Lambert.Intl.AP.724340_TMY3.epw' hpxml_bldg.state_code = 'MO' elsif hpxml_file.include?('CZ6') hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.clear - years.each do |year| - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: year, - zone: '6A') - end + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, + zone: '6A') hpxml_bldg.climate_and_risk_zones.weather_station_name = 'Burlington, VT' hpxml_bldg.climate_and_risk_zones.weather_station_epw_filepath = 'USA_VT_Burlington.Intl.AP.726170_TMY3.epw' hpxml_bldg.state_code = 'VT' @@ -2491,30 +2481,16 @@ def create_sample_hpxmls if hpxml_bldg.state_code.nil? hpxml_bldg.state_code = 'NA' end - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.empty? - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(zone: '3A', - year: 2006) - end - end - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == Integer(hpxml.header.iecc_eri_calculation_version) }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: Integer(hpxml.header.iecc_eri_calculation_version), - zone: hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone) + hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, + zone: '3A') end # Handle different inputs for ENERGY STAR/ZERH if hpxml_path.include? 'base-bldgtype-mf-unit' hpxml.header.zerh_calculation_version = ZERHConstants::MFVer2 - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == 2021 }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2021, - zone: hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone) - end else hpxml.header.zerh_calculation_version = ZERHConstants::SFVer2 - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == 2021 }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2021, - zone: hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone) - end end if hpxml_path.include? 'base-bldgtype-mf-unit' hpxml.header.energystar_calculation_version = ESConstants::MFNationalVer1_2 @@ -2593,12 +2569,6 @@ def create_sample_hpxmls hpxml.header.co2index_calculation_version = nil hpxml.header.energystar_calculation_version = nil hpxml.header.zerh_calculation_version = nil - zone = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone - if hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.select { |z| z.year == Integer(iecc_version) }.size == 0 - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: Integer(iecc_version), - zone: zone) - end - XMLHelper.write_file(hpxml.to_doc, "workflow/sample_files/base-version-iecc-eri-#{iecc_version}.xml") end diff --git a/workflow/real_homes/house001.xml b/workflow/real_homes/house001.xml index ff0930117..532bf44c5 100644 --- a/workflow/real_homes/house001.xml +++ b/workflow/real_homes/house001.xml @@ -59,18 +59,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house002.xml b/workflow/real_homes/house002.xml index 77428e1a8..948eb57df 100644 --- a/workflow/real_homes/house002.xml +++ b/workflow/real_homes/house002.xml @@ -58,14 +58,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St. Louis, MO diff --git a/workflow/real_homes/house003.xml b/workflow/real_homes/house003.xml index fadb70330..ec78a6dea 100644 --- a/workflow/real_homes/house003.xml +++ b/workflow/real_homes/house003.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - Raleigh, NC diff --git a/workflow/real_homes/house004.xml b/workflow/real_homes/house004.xml index dfbb887ac..ad7335a2f 100644 --- a/workflow/real_homes/house004.xml +++ b/workflow/real_homes/house004.xml @@ -59,14 +59,6 @@ 2006 6A - - 2021 - 6A - - - 2024 - 6A - Duluth, MN diff --git a/workflow/real_homes/house005.xml b/workflow/real_homes/house005.xml index 57d160f01..5d3f52c69 100644 --- a/workflow/real_homes/house005.xml +++ b/workflow/real_homes/house005.xml @@ -59,18 +59,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house006.xml b/workflow/real_homes/house006.xml index 98c4cedb9..c2832a01d 100644 --- a/workflow/real_homes/house006.xml +++ b/workflow/real_homes/house006.xml @@ -58,14 +58,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Raleigh, NC diff --git a/workflow/real_homes/house007.xml b/workflow/real_homes/house007.xml index b42ea34c6..62b7cf2e9 100644 --- a/workflow/real_homes/house007.xml +++ b/workflow/real_homes/house007.xml @@ -58,18 +58,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house008.xml b/workflow/real_homes/house008.xml index d8ccb4267..cef8b060a 100644 --- a/workflow/real_homes/house008.xml +++ b/workflow/real_homes/house008.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house009.xml b/workflow/real_homes/house009.xml index 80f35b731..80445cfe1 100644 --- a/workflow/real_homes/house009.xml +++ b/workflow/real_homes/house009.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house010.xml b/workflow/real_homes/house010.xml index 73b49cc9d..b2cfa7b34 100644 --- a/workflow/real_homes/house010.xml +++ b/workflow/real_homes/house010.xml @@ -59,14 +59,6 @@ 2006 3B - - 2021 - 3B - - - 2024 - 3B - Las Vegas, NV diff --git a/workflow/real_homes/house011.xml b/workflow/real_homes/house011.xml index fcfe1ccba..bc092ff47 100644 --- a/workflow/real_homes/house011.xml +++ b/workflow/real_homes/house011.xml @@ -59,18 +59,6 @@ 2006 4A - - 2015 - 4A - - - 2021 - 4A - - - 2024 - 4A - New York, NY diff --git a/workflow/real_homes/house012.xml b/workflow/real_homes/house012.xml index 3878c1d8e..91d3b74a7 100644 --- a/workflow/real_homes/house012.xml +++ b/workflow/real_homes/house012.xml @@ -58,14 +58,6 @@ 2006 6A - - 2021 - 6A - - - 2024 - 6A - Burlington, VT diff --git a/workflow/real_homes/house013.xml b/workflow/real_homes/house013.xml index 62418ff98..813f81be4 100644 --- a/workflow/real_homes/house013.xml +++ b/workflow/real_homes/house013.xml @@ -58,14 +58,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Seattle, WA diff --git a/workflow/real_homes/house014.xml b/workflow/real_homes/house014.xml index 54a8ae266..4dcb8b96d 100644 --- a/workflow/real_homes/house014.xml +++ b/workflow/real_homes/house014.xml @@ -58,14 +58,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - New York, NY diff --git a/workflow/real_homes/house015.xml b/workflow/real_homes/house015.xml index 2a18b0c19..087921a6c 100644 --- a/workflow/real_homes/house015.xml +++ b/workflow/real_homes/house015.xml @@ -58,14 +58,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Phoenix, AZ diff --git a/workflow/real_homes/house016.xml b/workflow/real_homes/house016.xml index ccb0b51e0..7e9901ad7 100644 --- a/workflow/real_homes/house016.xml +++ b/workflow/real_homes/house016.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Phoenix, AZ diff --git a/workflow/real_homes/house017.xml b/workflow/real_homes/house017.xml index f80b6ebf0..b649d460a 100644 --- a/workflow/real_homes/house017.xml +++ b/workflow/real_homes/house017.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Colorado Springs, CO diff --git a/workflow/real_homes/house018.xml b/workflow/real_homes/house018.xml index 0099025b5..46a1f8a08 100644 --- a/workflow/real_homes/house018.xml +++ b/workflow/real_homes/house018.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - New York, NY diff --git a/workflow/real_homes/house019.xml b/workflow/real_homes/house019.xml index c0d2624a6..03844489e 100644 --- a/workflow/real_homes/house019.xml +++ b/workflow/real_homes/house019.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house020.xml b/workflow/real_homes/house020.xml index dd9749c44..1f6141508 100644 --- a/workflow/real_homes/house020.xml +++ b/workflow/real_homes/house020.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Colorado Springs, CO diff --git a/workflow/real_homes/house021.xml b/workflow/real_homes/house021.xml index a14619798..0bf496178 100644 --- a/workflow/real_homes/house021.xml +++ b/workflow/real_homes/house021.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house022.xml b/workflow/real_homes/house022.xml index 5d8203979..8274c6bf2 100644 --- a/workflow/real_homes/house022.xml +++ b/workflow/real_homes/house022.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Phoenix, AZ diff --git a/workflow/real_homes/house023.xml b/workflow/real_homes/house023.xml index c14e8c1f5..22aa3e909 100644 --- a/workflow/real_homes/house023.xml +++ b/workflow/real_homes/house023.xml @@ -58,14 +58,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house024.xml b/workflow/real_homes/house024.xml index f7a9c96ad..67cacd3a5 100644 --- a/workflow/real_homes/house024.xml +++ b/workflow/real_homes/house024.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house025.xml b/workflow/real_homes/house025.xml index e8777fda0..da82d15f5 100644 --- a/workflow/real_homes/house025.xml +++ b/workflow/real_homes/house025.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house026.xml b/workflow/real_homes/house026.xml index 32327e5d3..a8798b96c 100644 --- a/workflow/real_homes/house026.xml +++ b/workflow/real_homes/house026.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house027.xml b/workflow/real_homes/house027.xml index d3101b7d5..16f2e1777 100644 --- a/workflow/real_homes/house027.xml +++ b/workflow/real_homes/house027.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house028.xml b/workflow/real_homes/house028.xml index 4805b0dac..36309d973 100644 --- a/workflow/real_homes/house028.xml +++ b/workflow/real_homes/house028.xml @@ -58,14 +58,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house029.xml b/workflow/real_homes/house029.xml index 840e4d34a..dcdfe53f4 100644 --- a/workflow/real_homes/house029.xml +++ b/workflow/real_homes/house029.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house030.xml b/workflow/real_homes/house030.xml index 34cc141d9..31bc3fd30 100644 --- a/workflow/real_homes/house030.xml +++ b/workflow/real_homes/house030.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house031.xml b/workflow/real_homes/house031.xml index 4224d4054..4794852d5 100644 --- a/workflow/real_homes/house031.xml +++ b/workflow/real_homes/house031.xml @@ -58,14 +58,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house032.xml b/workflow/real_homes/house032.xml index 7328f75ca..a4b96f3d0 100644 --- a/workflow/real_homes/house032.xml +++ b/workflow/real_homes/house032.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house033.xml b/workflow/real_homes/house033.xml index c4f89aaf2..700f02f36 100644 --- a/workflow/real_homes/house033.xml +++ b/workflow/real_homes/house033.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St. Louis, MO diff --git a/workflow/real_homes/house034.xml b/workflow/real_homes/house034.xml index 0a8ae1d9b..ef756f8a2 100644 --- a/workflow/real_homes/house034.xml +++ b/workflow/real_homes/house034.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house035.xml b/workflow/real_homes/house035.xml index 0ca47e467..93e29cfec 100644 --- a/workflow/real_homes/house035.xml +++ b/workflow/real_homes/house035.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house036.xml b/workflow/real_homes/house036.xml index 36b32738f..60ced3a08 100644 --- a/workflow/real_homes/house036.xml +++ b/workflow/real_homes/house036.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Chicago, IL diff --git a/workflow/real_homes/house037.xml b/workflow/real_homes/house037.xml index de80bc61d..a9e20a75f 100644 --- a/workflow/real_homes/house037.xml +++ b/workflow/real_homes/house037.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house038.xml b/workflow/real_homes/house038.xml index 4bdd5f6ec..629ce055c 100644 --- a/workflow/real_homes/house038.xml +++ b/workflow/real_homes/house038.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Atlanta, GA diff --git a/workflow/real_homes/house039.xml b/workflow/real_homes/house039.xml index 4adffb78a..578cd314f 100644 --- a/workflow/real_homes/house039.xml +++ b/workflow/real_homes/house039.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house040.xml b/workflow/real_homes/house040.xml index 15674d7c8..ba89276bc 100644 --- a/workflow/real_homes/house040.xml +++ b/workflow/real_homes/house040.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Detroit, MI diff --git a/workflow/real_homes/house041.xml b/workflow/real_homes/house041.xml index 5d2e0567e..f79f596ed 100644 --- a/workflow/real_homes/house041.xml +++ b/workflow/real_homes/house041.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house042.xml b/workflow/real_homes/house042.xml index cb48ddbf9..9bd276513 100644 --- a/workflow/real_homes/house042.xml +++ b/workflow/real_homes/house042.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St. Louis, MO diff --git a/workflow/real_homes/house043.xml b/workflow/real_homes/house043.xml index 9bfaecdf1..595b039fd 100644 --- a/workflow/real_homes/house043.xml +++ b/workflow/real_homes/house043.xml @@ -58,14 +58,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house044.xml b/workflow/real_homes/house044.xml index d1f32ec39..53c9cf411 100644 --- a/workflow/real_homes/house044.xml +++ b/workflow/real_homes/house044.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Chicago, IL diff --git a/workflow/real_homes/house045.xml b/workflow/real_homes/house045.xml index 22f0f37c8..1f60a4b3e 100644 --- a/workflow/real_homes/house045.xml +++ b/workflow/real_homes/house045.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - Raleigh, NC diff --git a/workflow/real_homes/house046.xml b/workflow/real_homes/house046.xml index 3c68f12b4..e67d3c845 100644 --- a/workflow/real_homes/house046.xml +++ b/workflow/real_homes/house046.xml @@ -58,14 +58,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - Chicago, IL diff --git a/workflow/real_homes/house047.xml b/workflow/real_homes/house047.xml index 625a846ee..9a2dd5e9b 100644 --- a/workflow/real_homes/house047.xml +++ b/workflow/real_homes/house047.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house048.xml b/workflow/real_homes/house048.xml index ad95bde07..53d65781b 100644 --- a/workflow/real_homes/house048.xml +++ b/workflow/real_homes/house048.xml @@ -59,10 +59,6 @@ 2006 2B - - 2021 - 2B - Phoenix, AZ diff --git a/workflow/real_homes/house049.xml b/workflow/real_homes/house049.xml index 280fab397..136a52349 100644 --- a/workflow/real_homes/house049.xml +++ b/workflow/real_homes/house049.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house050.xml b/workflow/real_homes/house050.xml index 8f51167c2..153be3ca0 100644 --- a/workflow/real_homes/house050.xml +++ b/workflow/real_homes/house050.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house051.xml b/workflow/real_homes/house051.xml index 9fbe0ae7e..892cc4a38 100644 --- a/workflow/real_homes/house051.xml +++ b/workflow/real_homes/house051.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house052.xml b/workflow/real_homes/house052.xml index 96af219b5..7b163378a 100644 --- a/workflow/real_homes/house052.xml +++ b/workflow/real_homes/house052.xml @@ -58,14 +58,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Seattle, WA diff --git a/workflow/real_homes/house053.xml b/workflow/real_homes/house053.xml index df21e4696..7bbf6eff1 100644 --- a/workflow/real_homes/house053.xml +++ b/workflow/real_homes/house053.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house054.xml b/workflow/real_homes/house054.xml index a105d9e84..4ad29e912 100644 --- a/workflow/real_homes/house054.xml +++ b/workflow/real_homes/house054.xml @@ -59,10 +59,6 @@ 2006 2B - - 2021 - 2B - Phoenix, AZ diff --git a/workflow/real_homes/house055.xml b/workflow/real_homes/house055.xml index 16199f5e4..61d9fb1bc 100644 --- a/workflow/real_homes/house055.xml +++ b/workflow/real_homes/house055.xml @@ -59,10 +59,6 @@ 2006 2B - - 2021 - 2B - Phoenix, AZ diff --git a/workflow/real_homes/house056.xml b/workflow/real_homes/house056.xml index cf7679a35..b3ba9238c 100644 --- a/workflow/real_homes/house056.xml +++ b/workflow/real_homes/house056.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house057.xml b/workflow/real_homes/house057.xml index 1e019dac8..3c1fc0bd5 100644 --- a/workflow/real_homes/house057.xml +++ b/workflow/real_homes/house057.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house058.xml b/workflow/real_homes/house058.xml index 3dede7fcb..90dbc9189 100644 --- a/workflow/real_homes/house058.xml +++ b/workflow/real_homes/house058.xml @@ -59,10 +59,6 @@ 2006 2B - - 2021 - 2B - Phoenix, AZ diff --git a/workflow/real_homes/house059.xml b/workflow/real_homes/house059.xml index 6492fb469..7e3631283 100644 --- a/workflow/real_homes/house059.xml +++ b/workflow/real_homes/house059.xml @@ -59,14 +59,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Portland, OR diff --git a/workflow/real_homes/house060.xml b/workflow/real_homes/house060.xml index b31a643f4..57fedaf9d 100644 --- a/workflow/real_homes/house060.xml +++ b/workflow/real_homes/house060.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Atlanta, GA diff --git a/workflow/real_homes/house061.xml b/workflow/real_homes/house061.xml index e4b536efc..ef4412898 100644 --- a/workflow/real_homes/house061.xml +++ b/workflow/real_homes/house061.xml @@ -59,18 +59,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house062.xml b/workflow/real_homes/house062.xml index f3483ec69..79f9e5320 100644 --- a/workflow/real_homes/house062.xml +++ b/workflow/real_homes/house062.xml @@ -58,18 +58,6 @@ 2006 3A - - 2015 - 3A - - - 2021 - 3A - - - 2024 - 3A - Raleigh, NC diff --git a/workflow/real_homes/house063.xml b/workflow/real_homes/house063.xml index 16e6101c3..7ac716969 100644 --- a/workflow/real_homes/house063.xml +++ b/workflow/real_homes/house063.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house064.xml b/workflow/real_homes/house064.xml index ece59e8de..cd87cab38 100644 --- a/workflow/real_homes/house064.xml +++ b/workflow/real_homes/house064.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house065.xml b/workflow/real_homes/house065.xml index 424b3280c..711552827 100644 --- a/workflow/real_homes/house065.xml +++ b/workflow/real_homes/house065.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house066.xml b/workflow/real_homes/house066.xml index a62597f15..fa1198921 100644 --- a/workflow/real_homes/house066.xml +++ b/workflow/real_homes/house066.xml @@ -58,14 +58,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house067.xml b/workflow/real_homes/house067.xml index 872248525..d7f703853 100644 --- a/workflow/real_homes/house067.xml +++ b/workflow/real_homes/house067.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house068.xml b/workflow/real_homes/house068.xml index 731cde3e7..2d970b06d 100644 --- a/workflow/real_homes/house068.xml +++ b/workflow/real_homes/house068.xml @@ -59,14 +59,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house069.xml b/workflow/real_homes/house069.xml index 7757c77fc..4c46c400e 100644 --- a/workflow/real_homes/house069.xml +++ b/workflow/real_homes/house069.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house070.xml b/workflow/real_homes/house070.xml index c9125ce5b..4a8c51de9 100644 --- a/workflow/real_homes/house070.xml +++ b/workflow/real_homes/house070.xml @@ -58,14 +58,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house071.xml b/workflow/real_homes/house071.xml index f50106f43..bb313e301 100644 --- a/workflow/real_homes/house071.xml +++ b/workflow/real_homes/house071.xml @@ -59,14 +59,6 @@ 2006 5A - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house072.xml b/workflow/real_homes/house072.xml index ccc0873fe..670a889e2 100644 --- a/workflow/real_homes/house072.xml +++ b/workflow/real_homes/house072.xml @@ -59,14 +59,6 @@ 2006 6A - - 2021 - 6A - - - 2024 - 6A - Duluth, MN diff --git a/workflow/real_homes/house073.xml b/workflow/real_homes/house073.xml index 3ca7a38bd..37e326a0b 100644 --- a/workflow/real_homes/house073.xml +++ b/workflow/real_homes/house073.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - New York, NY diff --git a/workflow/real_homes/house074.xml b/workflow/real_homes/house074.xml index 8f0645926..e3fbe40ce 100644 --- a/workflow/real_homes/house074.xml +++ b/workflow/real_homes/house074.xml @@ -59,14 +59,6 @@ 2006 3B - - 2021 - 3B - - - 2024 - 3B - Dallas, TX diff --git a/workflow/real_homes/house075.xml b/workflow/real_homes/house075.xml index e93905e31..c39d77e80 100644 --- a/workflow/real_homes/house075.xml +++ b/workflow/real_homes/house075.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St Louis, MO diff --git a/workflow/real_homes/house076.xml b/workflow/real_homes/house076.xml index 02c85ae1b..9ac34cdf4 100644 --- a/workflow/real_homes/house076.xml +++ b/workflow/real_homes/house076.xml @@ -59,18 +59,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house077.xml b/workflow/real_homes/house077.xml index 2b5ba1658..19ee835a6 100644 --- a/workflow/real_homes/house077.xml +++ b/workflow/real_homes/house077.xml @@ -59,18 +59,6 @@ 2006 6A - - 2015 - 6A - - - 2021 - 6A - - - 2024 - 6A - Chicago, IL diff --git a/workflow/real_homes/house078.xml b/workflow/real_homes/house078.xml index d29c57d26..c4b435930 100644 --- a/workflow/real_homes/house078.xml +++ b/workflow/real_homes/house078.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house079.xml b/workflow/real_homes/house079.xml index 9d5363116..eef3a8cf1 100644 --- a/workflow/real_homes/house079.xml +++ b/workflow/real_homes/house079.xml @@ -58,14 +58,6 @@ 2006 4C - - 2021 - 4C - - - 2024 - 4C - Seattle, WA diff --git a/workflow/real_homes/house080.xml b/workflow/real_homes/house080.xml index b1e300bf8..94ab6b972 100644 --- a/workflow/real_homes/house080.xml +++ b/workflow/real_homes/house080.xml @@ -58,14 +58,6 @@ 2006 3A - - 2021 - 3A - - - 2024 - 3A - Dallas, TX diff --git a/workflow/real_homes/house081.xml b/workflow/real_homes/house081.xml index 3a27d0526..cf9d2e163 100644 --- a/workflow/real_homes/house081.xml +++ b/workflow/real_homes/house081.xml @@ -58,14 +58,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St. Louis, MO diff --git a/workflow/real_homes/house082.xml b/workflow/real_homes/house082.xml index 8a2dd721a..564479ee0 100644 --- a/workflow/real_homes/house082.xml +++ b/workflow/real_homes/house082.xml @@ -59,14 +59,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house083.xml b/workflow/real_homes/house083.xml index 64ca1fbb7..75bf2b089 100644 --- a/workflow/real_homes/house083.xml +++ b/workflow/real_homes/house083.xml @@ -57,14 +57,6 @@ 2006 2A - - 2021 - 2A - - - 2024 - 2A - Dallas, TX diff --git a/workflow/real_homes/house084.xml b/workflow/real_homes/house084.xml index 2c7e5268a..56f2ef2eb 100644 --- a/workflow/real_homes/house084.xml +++ b/workflow/real_homes/house084.xml @@ -59,14 +59,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house085.xml b/workflow/real_homes/house085.xml index 0f388c5ea..fb52b844b 100644 --- a/workflow/real_homes/house085.xml +++ b/workflow/real_homes/house085.xml @@ -58,14 +58,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - Denver, CO diff --git a/workflow/real_homes/house086.xml b/workflow/real_homes/house086.xml index 9d583a232..5597db5ba 100644 --- a/workflow/real_homes/house086.xml +++ b/workflow/real_homes/house086.xml @@ -58,14 +58,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - Raleigh, NC diff --git a/workflow/real_homes/house087.xml b/workflow/real_homes/house087.xml index 06d2fd19e..52452ce19 100644 --- a/workflow/real_homes/house087.xml +++ b/workflow/real_homes/house087.xml @@ -60,18 +60,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house088.xml b/workflow/real_homes/house088.xml index e30fa3d09..587afadfb 100644 --- a/workflow/real_homes/house088.xml +++ b/workflow/real_homes/house088.xml @@ -59,14 +59,6 @@ 2006 4A - - 2021 - 4A - - - 2024 - 4A - St. Louis, MO diff --git a/workflow/real_homes/house089.xml b/workflow/real_homes/house089.xml index 8428756e0..db3ac144f 100644 --- a/workflow/real_homes/house089.xml +++ b/workflow/real_homes/house089.xml @@ -60,14 +60,6 @@ 2006 3B - - 2021 - 3B - - - 2024 - 3B - Dallas, TX diff --git a/workflow/real_homes/house090.xml b/workflow/real_homes/house090.xml index c5245989f..00b6a5d31 100644 --- a/workflow/real_homes/house090.xml +++ b/workflow/real_homes/house090.xml @@ -60,18 +60,6 @@ 2006 5A - - 2015 - 5A - - - 2021 - 5A - - - 2024 - 5A - New York, NY diff --git a/workflow/real_homes/house091.xml b/workflow/real_homes/house091.xml index 7f1c19dfa..011d49f51 100644 --- a/workflow/real_homes/house091.xml +++ b/workflow/real_homes/house091.xml @@ -60,14 +60,6 @@ 2006 5B - - 2021 - 5B - - - 2024 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/real_homes/house092.xml b/workflow/real_homes/house092.xml index 858afcd02..a5da1a1f1 100644 --- a/workflow/real_homes/house092.xml +++ b/workflow/real_homes/house092.xml @@ -59,14 +59,6 @@ 2006 3B - - 2021 - 3B - - - 2024 - 3B - Dallas, TX diff --git a/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml b/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml index 5816a1f9d..d3f27902d 100644 --- a/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml +++ b/workflow/sample_files/base-appliances-dehumidifier-ief-portable.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml b/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml index 9ed69b853..565cba37d 100644 --- a/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml +++ b/workflow/sample_files/base-appliances-dehumidifier-ief-whole-home.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-appliances-dehumidifier-multiple.xml b/workflow/sample_files/base-appliances-dehumidifier-multiple.xml index 7b73a4a9c..049de3346 100644 --- a/workflow/sample_files/base-appliances-dehumidifier-multiple.xml +++ b/workflow/sample_files/base-appliances-dehumidifier-multiple.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-appliances-dehumidifier.xml b/workflow/sample_files/base-appliances-dehumidifier.xml index 333d7a165..19f140c45 100644 --- a/workflow/sample_files/base-appliances-dehumidifier.xml +++ b/workflow/sample_files/base-appliances-dehumidifier.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-appliances-gas.xml b/workflow/sample_files/base-appliances-gas.xml index 13bcbf7dd..97fd32bd0 100644 --- a/workflow/sample_files/base-appliances-gas.xml +++ b/workflow/sample_files/base-appliances-gas.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-appliances-modified.xml b/workflow/sample_files/base-appliances-modified.xml index 071aff0ec..679e985d4 100644 --- a/workflow/sample_files/base-appliances-modified.xml +++ b/workflow/sample_files/base-appliances-modified.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-appliances-none.xml b/workflow/sample_files/base-appliances-none.xml index d2b5572d1..322f1a19b 100644 --- a/workflow/sample_files/base-appliances-none.xml +++ b/workflow/sample_files/base-appliances-none.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-appliances-oil.xml b/workflow/sample_files/base-appliances-oil.xml index 854c70f1e..332422bb7 100644 --- a/workflow/sample_files/base-appliances-oil.xml +++ b/workflow/sample_files/base-appliances-oil.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-appliances-propane.xml b/workflow/sample_files/base-appliances-propane.xml index 882cdce82..81bc499c3 100644 --- a/workflow/sample_files/base-appliances-propane.xml +++ b/workflow/sample_files/base-appliances-propane.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-appliances-wood.xml b/workflow/sample_files/base-appliances-wood.xml index a2bb1ed5d..4171ec3b4 100644 --- a/workflow/sample_files/base-appliances-wood.xml +++ b/workflow/sample_files/base-appliances-wood.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-atticroof-cathedral.xml b/workflow/sample_files/base-atticroof-cathedral.xml index a59f14799..bcd2cffc5 100644 --- a/workflow/sample_files/base-atticroof-cathedral.xml +++ b/workflow/sample_files/base-atticroof-cathedral.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-atticroof-conditioned.xml b/workflow/sample_files/base-atticroof-conditioned.xml index 1af7570e7..5f1fc6267 100644 --- a/workflow/sample_files/base-atticroof-conditioned.xml +++ b/workflow/sample_files/base-atticroof-conditioned.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-atticroof-flat.xml b/workflow/sample_files/base-atticroof-flat.xml index 33df6313c..fdc5c7ad8 100644 --- a/workflow/sample_files/base-atticroof-flat.xml +++ b/workflow/sample_files/base-atticroof-flat.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-atticroof-radiant-barrier.xml b/workflow/sample_files/base-atticroof-radiant-barrier.xml index d71869ce3..e70ec2fed 100644 --- a/workflow/sample_files/base-atticroof-radiant-barrier.xml +++ b/workflow/sample_files/base-atticroof-radiant-barrier.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml b/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml index af1fc4963..58e0cd6b3 100644 --- a/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml +++ b/workflow/sample_files/base-atticroof-unvented-insulated-roof.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-atticroof-vented.xml b/workflow/sample_files/base-atticroof-vented.xml index 65def6713..f7ec3b16f 100644 --- a/workflow/sample_files/base-atticroof-vented.xml +++ b/workflow/sample_files/base-atticroof-vented.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-battery.xml b/workflow/sample_files/base-battery.xml index f57129695..b63d912df 100644 --- a/workflow/sample_files/base-battery.xml +++ b/workflow/sample_files/base-battery.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml index 12ebd9327..3127906f3 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-adjacent-to-multiple.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-location-portland-or.xml b/workflow/sample_files/base-bldgtype-mf-unit-location-portland-or.xml index d55836e22..74ae9bd00 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-location-portland-or.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-location-portland-or.xml @@ -58,14 +58,6 @@ 2006 4C - - 2024 - 5B - - - 2021 - 5B - Portland, OR diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml index 68410140b..1c83e3e95 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-baseboard.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml index 12bba8835..3e89e7b32 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml index dbec44beb..3888c280d 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-fan-coil.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml index a94e2a37a..65b1b2c6a 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-boiler-only-water-loop-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml index 09a4adbd4..19dcb6c87 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-baseboard.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml index 4fa2a4ab3..663cb6c69 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml index 3b90db238..2e48a6284 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-fan-coil.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml index eeeb861cd..587989976 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-chiller-only-water-loop-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml index 60adfa3dc..4fe39adcb 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-cooling-tower-only-water-loop-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml index 4003831ed..9bbc86f99 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-generator.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml index bffb78b05..239330b78 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-ground-loop-ground-to-air-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml index 6928b0739..3bd90eaaa 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room-multiple-water-heaters.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml index c55b3afcb..f4a478cfc 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-laundry-room.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml index db16beaaa..931625d27 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent-preconditioning.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml index c80e93576..69fb86ffd 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-mechvent.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml index 9a9a0b1dd..c44ca00da 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml index af141ffdc..d499e1b08 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml index 92418b6cc..ca8f8e138 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml index fea1a028a..e7ad6a6b5 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater-recirc.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml index e0e6c797c..6eb172e8c 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-water-heater.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-mf-unit.xml b/workflow/sample_files/base-bldgtype-mf-unit.xml index 80fd72e57..e0a5265f3 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-bldgtype-sfa-unit.xml b/workflow/sample_files/base-bldgtype-sfa-unit.xml index abb6654cc..6de8cace0 100644 --- a/workflow/sample_files/base-bldgtype-sfa-unit.xml +++ b/workflow/sample_files/base-bldgtype-sfa-unit.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-combi-tankless.xml b/workflow/sample_files/base-dhw-combi-tankless.xml index 57279b8df..1a510ef7e 100644 --- a/workflow/sample_files/base-dhw-combi-tankless.xml +++ b/workflow/sample_files/base-dhw-combi-tankless.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-desuperheater.xml b/workflow/sample_files/base-dhw-desuperheater.xml index d4044b48f..fe4fb184c 100644 --- a/workflow/sample_files/base-dhw-desuperheater.xml +++ b/workflow/sample_files/base-dhw-desuperheater.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-dwhr.xml b/workflow/sample_files/base-dhw-dwhr.xml index 9a423c6a0..88793b4ee 100644 --- a/workflow/sample_files/base-dhw-dwhr.xml +++ b/workflow/sample_files/base-dhw-dwhr.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-indirect-standbyloss.xml b/workflow/sample_files/base-dhw-indirect-standbyloss.xml index fc4a246da..29094b738 100644 --- a/workflow/sample_files/base-dhw-indirect-standbyloss.xml +++ b/workflow/sample_files/base-dhw-indirect-standbyloss.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-jacket-gas.xml b/workflow/sample_files/base-dhw-jacket-gas.xml index 799aeff51..d9bd63d37 100644 --- a/workflow/sample_files/base-dhw-jacket-gas.xml +++ b/workflow/sample_files/base-dhw-jacket-gas.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-jacket-hpwh.xml b/workflow/sample_files/base-dhw-jacket-hpwh.xml index f605dc8e8..475fc60a0 100644 --- a/workflow/sample_files/base-dhw-jacket-hpwh.xml +++ b/workflow/sample_files/base-dhw-jacket-hpwh.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-jacket-indirect.xml b/workflow/sample_files/base-dhw-jacket-indirect.xml index 5706403d8..7ff9d580c 100644 --- a/workflow/sample_files/base-dhw-jacket-indirect.xml +++ b/workflow/sample_files/base-dhw-jacket-indirect.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-low-flow-fixtures.xml b/workflow/sample_files/base-dhw-low-flow-fixtures.xml index 41e814afc..a895a15c0 100644 --- a/workflow/sample_files/base-dhw-low-flow-fixtures.xml +++ b/workflow/sample_files/base-dhw-low-flow-fixtures.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-multiple.xml b/workflow/sample_files/base-dhw-multiple.xml index d539911c0..8cbd94c26 100644 --- a/workflow/sample_files/base-dhw-multiple.xml +++ b/workflow/sample_files/base-dhw-multiple.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-none.xml b/workflow/sample_files/base-dhw-none.xml index 12f07bf79..ad6da604b 100644 --- a/workflow/sample_files/base-dhw-none.xml +++ b/workflow/sample_files/base-dhw-none.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-recirc-demand.xml b/workflow/sample_files/base-dhw-recirc-demand.xml index 2bf87dd4a..6936aba6b 100644 --- a/workflow/sample_files/base-dhw-recirc-demand.xml +++ b/workflow/sample_files/base-dhw-recirc-demand.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-solar-fraction.xml b/workflow/sample_files/base-dhw-solar-fraction.xml index bcd5e1a64..a77060b80 100644 --- a/workflow/sample_files/base-dhw-solar-fraction.xml +++ b/workflow/sample_files/base-dhw-solar-fraction.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml b/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml index 89291a8e8..f27a9c983 100644 --- a/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml +++ b/workflow/sample_files/base-dhw-solar-indirect-flat-plate.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tank-elec-uef.xml b/workflow/sample_files/base-dhw-tank-elec-uef.xml index 972c669c2..866fc0592 100644 --- a/workflow/sample_files/base-dhw-tank-elec-uef.xml +++ b/workflow/sample_files/base-dhw-tank-elec-uef.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tank-gas-uef.xml b/workflow/sample_files/base-dhw-tank-gas-uef.xml index a56c9d08e..27df7e902 100644 --- a/workflow/sample_files/base-dhw-tank-gas-uef.xml +++ b/workflow/sample_files/base-dhw-tank-gas-uef.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml b/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml index cb41715be..22444c892 100644 --- a/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml +++ b/workflow/sample_files/base-dhw-tank-heat-pump-uef.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tank-oil.xml b/workflow/sample_files/base-dhw-tank-oil.xml index 1f5f9c626..4e16b080d 100644 --- a/workflow/sample_files/base-dhw-tank-oil.xml +++ b/workflow/sample_files/base-dhw-tank-oil.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tank-wood.xml b/workflow/sample_files/base-dhw-tank-wood.xml index 25b71ef8e..ad0ec89d2 100644 --- a/workflow/sample_files/base-dhw-tank-wood.xml +++ b/workflow/sample_files/base-dhw-tank-wood.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tankless-electric-uef.xml b/workflow/sample_files/base-dhw-tankless-electric-uef.xml index 43821e194..932138235 100644 --- a/workflow/sample_files/base-dhw-tankless-electric-uef.xml +++ b/workflow/sample_files/base-dhw-tankless-electric-uef.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tankless-gas-uef.xml b/workflow/sample_files/base-dhw-tankless-gas-uef.xml index 22f9b4b4c..8d5d965a9 100644 --- a/workflow/sample_files/base-dhw-tankless-gas-uef.xml +++ b/workflow/sample_files/base-dhw-tankless-gas-uef.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-dhw-tankless-propane.xml b/workflow/sample_files/base-dhw-tankless-propane.xml index 5268c5905..cc6b30c6f 100644 --- a/workflow/sample_files/base-dhw-tankless-propane.xml +++ b/workflow/sample_files/base-dhw-tankless-propane.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-2stories-garage.xml b/workflow/sample_files/base-enclosure-2stories-garage.xml index dde51ab91..0e3d86ce8 100644 --- a/workflow/sample_files/base-enclosure-2stories-garage.xml +++ b/workflow/sample_files/base-enclosure-2stories-garage.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-2stories.xml b/workflow/sample_files/base-enclosure-2stories.xml index 64726237d..a6284202b 100644 --- a/workflow/sample_files/base-enclosure-2stories.xml +++ b/workflow/sample_files/base-enclosure-2stories.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-beds-1.xml b/workflow/sample_files/base-enclosure-beds-1.xml index c67b4c0c7..50e1baba2 100644 --- a/workflow/sample_files/base-enclosure-beds-1.xml +++ b/workflow/sample_files/base-enclosure-beds-1.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-beds-2.xml b/workflow/sample_files/base-enclosure-beds-2.xml index 05ddc1f90..a44e2e8b3 100644 --- a/workflow/sample_files/base-enclosure-beds-2.xml +++ b/workflow/sample_files/base-enclosure-beds-2.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-beds-4.xml b/workflow/sample_files/base-enclosure-beds-4.xml index 829bcf0c4..85319dccf 100644 --- a/workflow/sample_files/base-enclosure-beds-4.xml +++ b/workflow/sample_files/base-enclosure-beds-4.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-beds-5.xml b/workflow/sample_files/base-enclosure-beds-5.xml index dbf46a093..c02158a53 100644 --- a/workflow/sample_files/base-enclosure-beds-5.xml +++ b/workflow/sample_files/base-enclosure-beds-5.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-ceilingtypes.xml b/workflow/sample_files/base-enclosure-ceilingtypes.xml index 81cac6679..ca5180f6a 100644 --- a/workflow/sample_files/base-enclosure-ceilingtypes.xml +++ b/workflow/sample_files/base-enclosure-ceilingtypes.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-floortypes.xml b/workflow/sample_files/base-enclosure-floortypes.xml index d67ee9551..d4d50657e 100644 --- a/workflow/sample_files/base-enclosure-floortypes.xml +++ b/workflow/sample_files/base-enclosure-floortypes.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-garage.xml b/workflow/sample_files/base-enclosure-garage.xml index 59cd7d77d..47c644f15 100644 --- a/workflow/sample_files/base-enclosure-garage.xml +++ b/workflow/sample_files/base-enclosure-garage.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml b/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml index 1146137aa..2d66bbc00 100644 --- a/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml +++ b/workflow/sample_files/base-enclosure-infil-ach-house-pressure.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml b/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml index 17bbcdb2a..d532a529a 100644 --- a/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml +++ b/workflow/sample_files/base-enclosure-infil-cfm-house-pressure.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-cfm50.xml b/workflow/sample_files/base-enclosure-infil-cfm50.xml index fe4ccf85a..7de196c2e 100644 --- a/workflow/sample_files/base-enclosure-infil-cfm50.xml +++ b/workflow/sample_files/base-enclosure-infil-cfm50.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-ela.xml b/workflow/sample_files/base-enclosure-infil-ela.xml index c9b7b5700..d5c832483 100644 --- a/workflow/sample_files/base-enclosure-infil-ela.xml +++ b/workflow/sample_files/base-enclosure-infil-ela.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-natural-ach.xml b/workflow/sample_files/base-enclosure-infil-natural-ach.xml index 6426b4118..d84d2221b 100644 --- a/workflow/sample_files/base-enclosure-infil-natural-ach.xml +++ b/workflow/sample_files/base-enclosure-infil-natural-ach.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-infil-natural-cfm.xml b/workflow/sample_files/base-enclosure-infil-natural-cfm.xml index 93e399266..f64705fb7 100644 --- a/workflow/sample_files/base-enclosure-infil-natural-cfm.xml +++ b/workflow/sample_files/base-enclosure-infil-natural-cfm.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-overhangs.xml b/workflow/sample_files/base-enclosure-overhangs.xml index d2eb7fa47..98786fa0d 100644 --- a/workflow/sample_files/base-enclosure-overhangs.xml +++ b/workflow/sample_files/base-enclosure-overhangs.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-skylights-cathedral.xml b/workflow/sample_files/base-enclosure-skylights-cathedral.xml index a15c7257d..95f8b9a43 100644 --- a/workflow/sample_files/base-enclosure-skylights-cathedral.xml +++ b/workflow/sample_files/base-enclosure-skylights-cathedral.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-skylights.xml b/workflow/sample_files/base-enclosure-skylights.xml index be6521ee4..eb240e4b7 100644 --- a/workflow/sample_files/base-enclosure-skylights.xml +++ b/workflow/sample_files/base-enclosure-skylights.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-enclosure-walltypes.xml b/workflow/sample_files/base-enclosure-walltypes.xml index cda065ae5..2a2baa5d6 100644 --- a/workflow/sample_files/base-enclosure-walltypes.xml +++ b/workflow/sample_files/base-enclosure-walltypes.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-ambient.xml b/workflow/sample_files/base-foundation-ambient.xml index 55b411e12..a799f483d 100644 --- a/workflow/sample_files/base-foundation-ambient.xml +++ b/workflow/sample_files/base-foundation-ambient.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-basement-garage.xml b/workflow/sample_files/base-foundation-basement-garage.xml index 86cca7846..9f6791904 100644 --- a/workflow/sample_files/base-foundation-basement-garage.xml +++ b/workflow/sample_files/base-foundation-basement-garage.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml b/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml index 4b21d78a7..b1a9d290d 100644 --- a/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml +++ b/workflow/sample_files/base-foundation-conditioned-basement-slab-insulation.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml b/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml index eca3550eb..f1421d6f5 100644 --- a/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml +++ b/workflow/sample_files/base-foundation-conditioned-basement-wall-insulation.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-multiple.xml b/workflow/sample_files/base-foundation-multiple.xml index cead50e99..b154e1bb1 100644 --- a/workflow/sample_files/base-foundation-multiple.xml +++ b/workflow/sample_files/base-foundation-multiple.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-slab.xml b/workflow/sample_files/base-foundation-slab.xml index 5377d2126..c30776f4a 100644 --- a/workflow/sample_files/base-foundation-slab.xml +++ b/workflow/sample_files/base-foundation-slab.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml b/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml index 63d60dd8a..ddc324cbd 100644 --- a/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml +++ b/workflow/sample_files/base-foundation-unconditioned-basement-assembly-r.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml b/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml index c380aa04a..21a10bf70 100644 --- a/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml +++ b/workflow/sample_files/base-foundation-unconditioned-basement-wall-insulation.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-unconditioned-basement.xml b/workflow/sample_files/base-foundation-unconditioned-basement.xml index 937868346..3c1a86b67 100644 --- a/workflow/sample_files/base-foundation-unconditioned-basement.xml +++ b/workflow/sample_files/base-foundation-unconditioned-basement.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-unvented-crawlspace.xml b/workflow/sample_files/base-foundation-unvented-crawlspace.xml index 9575a3c4d..8a9c9fd75 100644 --- a/workflow/sample_files/base-foundation-unvented-crawlspace.xml +++ b/workflow/sample_files/base-foundation-unvented-crawlspace.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml b/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml index 5c561a0cb..2c99eae4e 100644 --- a/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml +++ b/workflow/sample_files/base-foundation-vented-crawlspace-above-grade.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-vented-crawlspace.xml b/workflow/sample_files/base-foundation-vented-crawlspace.xml index 71e22fd2d..4a96488d1 100644 --- a/workflow/sample_files/base-foundation-vented-crawlspace.xml +++ b/workflow/sample_files/base-foundation-vented-crawlspace.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-foundation-walkout-basement.xml b/workflow/sample_files/base-foundation-walkout-basement.xml index e445041c4..c214e7fd2 100644 --- a/workflow/sample_files/base-foundation-walkout-basement.xml +++ b/workflow/sample_files/base-foundation-walkout-basement.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml index 0fc9ddc6e..9b52d1c6f 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml index f248c616b..8232d6128 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml index 732b8a99c..531c5f63d 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml index b21605f30..b018fb647 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml index 81513f87a..175293491 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml index 3226f569c..f265a8f71 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml index 66ab74184..4f07d0c46 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-boiler-elec-only.xml b/workflow/sample_files/base-hvac-boiler-elec-only.xml index d812c52a2..d46ce3746 100644 --- a/workflow/sample_files/base-hvac-boiler-elec-only.xml +++ b/workflow/sample_files/base-hvac-boiler-elec-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-boiler-gas-only.xml b/workflow/sample_files/base-hvac-boiler-gas-only.xml index 15755da2d..ef9a60661 100644 --- a/workflow/sample_files/base-hvac-boiler-gas-only.xml +++ b/workflow/sample_files/base-hvac-boiler-gas-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-boiler-oil-only.xml b/workflow/sample_files/base-hvac-boiler-oil-only.xml index fc86d29eb..41820eb19 100644 --- a/workflow/sample_files/base-hvac-boiler-oil-only.xml +++ b/workflow/sample_files/base-hvac-boiler-oil-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-boiler-propane-only.xml b/workflow/sample_files/base-hvac-boiler-propane-only.xml index 6f1e0e260..499844a80 100644 --- a/workflow/sample_files/base-hvac-boiler-propane-only.xml +++ b/workflow/sample_files/base-hvac-boiler-propane-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml b/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml index b0f9274e0..e6c0f3edb 100644 --- a/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml +++ b/workflow/sample_files/base-hvac-central-ac-only-1-speed-seer2.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml b/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml index aee6f2247..17f935807 100644 --- a/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml +++ b/workflow/sample_files/base-hvac-central-ac-only-1-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml b/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml index 21e6a1c84..4c56259f3 100644 --- a/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml +++ b/workflow/sample_files/base-hvac-central-ac-only-2-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml b/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml index 4f0519c55..fa67d1187 100644 --- a/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml +++ b/workflow/sample_files/base-hvac-central-ac-only-var-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml b/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml index d8c446058..38fb57d6b 100644 --- a/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml +++ b/workflow/sample_files/base-hvac-central-ac-plus-air-to-air-heat-pump-heating.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-dse.xml b/workflow/sample_files/base-hvac-dse.xml index 9f070b490..56d89d975 100644 --- a/workflow/sample_files/base-hvac-dse.xml +++ b/workflow/sample_files/base-hvac-dse.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml b/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml index 8249058b5..bca91dbff 100644 --- a/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml +++ b/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml b/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml index f8717efd0..45d43e22a 100644 --- a/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml +++ b/workflow/sample_files/base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ducts-area-fractions.xml b/workflow/sample_files/base-hvac-ducts-area-fractions.xml index 33fcc8766..7c71ff8e7 100644 --- a/workflow/sample_files/base-hvac-ducts-area-fractions.xml +++ b/workflow/sample_files/base-hvac-ducts-area-fractions.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ducts-buried.xml b/workflow/sample_files/base-hvac-ducts-buried.xml index f907f0719..09da70e81 100644 --- a/workflow/sample_files/base-hvac-ducts-buried.xml +++ b/workflow/sample_files/base-hvac-ducts-buried.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml b/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml index e9a46fa9a..7abf4795f 100644 --- a/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml +++ b/workflow/sample_files/base-hvac-ducts-leakage-cfm50.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-elec-resistance-only.xml b/workflow/sample_files/base-hvac-elec-resistance-only.xml index 0240cf1da..a8495a730 100644 --- a/workflow/sample_files/base-hvac-elec-resistance-only.xml +++ b/workflow/sample_files/base-hvac-elec-resistance-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml b/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml index 7af6c211b..4488810da 100644 --- a/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml +++ b/workflow/sample_files/base-hvac-evap-cooler-only-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-evap-cooler-only.xml b/workflow/sample_files/base-hvac-evap-cooler-only.xml index 4833becab..cf387bd2b 100644 --- a/workflow/sample_files/base-hvac-evap-cooler-only.xml +++ b/workflow/sample_files/base-hvac-evap-cooler-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-fireplace-wood-only.xml b/workflow/sample_files/base-hvac-fireplace-wood-only.xml index 5af84a4b1..6a77e8ca9 100644 --- a/workflow/sample_files/base-hvac-fireplace-wood-only.xml +++ b/workflow/sample_files/base-hvac-fireplace-wood-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml b/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml index cec32629d..9dfa1a3ba 100644 --- a/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml +++ b/workflow/sample_files/base-hvac-floor-furnace-propane-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-furnace-elec-only.xml b/workflow/sample_files/base-hvac-furnace-elec-only.xml index 5013a294c..3c292172c 100644 --- a/workflow/sample_files/base-hvac-furnace-elec-only.xml +++ b/workflow/sample_files/base-hvac-furnace-elec-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-furnace-gas-only.xml b/workflow/sample_files/base-hvac-furnace-gas-only.xml index 80067bcc6..986b10362 100644 --- a/workflow/sample_files/base-hvac-furnace-gas-only.xml +++ b/workflow/sample_files/base-hvac-furnace-gas-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml b/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml index df1110298..fd6adf534 100644 --- a/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml +++ b/workflow/sample_files/base-hvac-ground-to-air-heat-pump-cooling-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml b/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml index 2e040fe20..7fd811a30 100644 --- a/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml +++ b/workflow/sample_files/base-hvac-ground-to-air-heat-pump-heating-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml b/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml index 7ccd4702e..896de5638 100644 --- a/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml +++ b/workflow/sample_files/base-hvac-ground-to-air-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml b/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml index bd5232bfe..c380632a9 100644 --- a/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml +++ b/workflow/sample_files/base-hvac-install-quality-air-to-air-heat-pump-1-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml b/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml index 1a914587d..2ad21eb5c 100644 --- a/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml +++ b/workflow/sample_files/base-hvac-install-quality-furnace-gas-central-ac-1-speed.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml b/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml index 326586c2a..daf325e97 100644 --- a/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml +++ b/workflow/sample_files/base-hvac-install-quality-ground-to-air-heat-pump.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml b/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml index 70154c125..680465612 100644 --- a/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml +++ b/workflow/sample_files/base-hvac-install-quality-mini-split-air-conditioner-only-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml b/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml index 51727f280..0135b9a32 100644 --- a/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml +++ b/workflow/sample_files/base-hvac-install-quality-mini-split-heat-pump-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml b/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml index 92dcece4a..ee08d861b 100644 --- a/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml +++ b/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml b/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml index 3afb97f9c..6c9bb4d97 100644 --- a/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml +++ b/workflow/sample_files/base-hvac-mini-split-air-conditioner-only-ductless.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml index 8aeae9707..5b34d2984 100644 --- a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml +++ b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-cooling-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml index 6f7817cf2..56662c62d 100644 --- a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml +++ b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted-heating-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml index 203ec0d3c..e75f41eed 100644 --- a/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml +++ b/workflow/sample_files/base-hvac-mini-split-heat-pump-ducted.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml b/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml index 1fcd32ed2..659fb60ac 100644 --- a/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml +++ b/workflow/sample_files/base-hvac-mini-split-heat-pump-ductless.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-multiple.xml b/workflow/sample_files/base-hvac-multiple.xml index f2642affa..73c86193f 100644 --- a/workflow/sample_files/base-hvac-multiple.xml +++ b/workflow/sample_files/base-hvac-multiple.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-none.xml b/workflow/sample_files/base-hvac-none.xml index 3afa02985..a4c005fa0 100644 --- a/workflow/sample_files/base-hvac-none.xml +++ b/workflow/sample_files/base-hvac-none.xml @@ -58,14 +58,6 @@ 2006 1A - - 2024 - 1A - - - 2021 - 1A - USA_HI_Honolulu.Intl.AP.911820_TMY3 diff --git a/workflow/sample_files/base-hvac-programmable-thermostat.xml b/workflow/sample_files/base-hvac-programmable-thermostat.xml index 66e9a19f8..ed3fc61a0 100644 --- a/workflow/sample_files/base-hvac-programmable-thermostat.xml +++ b/workflow/sample_files/base-hvac-programmable-thermostat.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml b/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml index dee1e26d9..ed42a08d7 100644 --- a/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml +++ b/workflow/sample_files/base-hvac-ptac-with-heating-electricity.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml b/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml index 16231baf5..7d6a1dfc5 100644 --- a/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml +++ b/workflow/sample_files/base-hvac-ptac-with-heating-natural-gas.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-ptac.xml b/workflow/sample_files/base-hvac-ptac.xml index ef65ee1e5..ca5465cb8 100644 --- a/workflow/sample_files/base-hvac-ptac.xml +++ b/workflow/sample_files/base-hvac-ptac.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-pthp.xml b/workflow/sample_files/base-hvac-pthp.xml index 13d5a944b..82c6bb2a5 100644 --- a/workflow/sample_files/base-hvac-pthp.xml +++ b/workflow/sample_files/base-hvac-pthp.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-room-ac-only-ceer.xml b/workflow/sample_files/base-hvac-room-ac-only-ceer.xml index 1f3f0c1f7..d9cafda12 100644 --- a/workflow/sample_files/base-hvac-room-ac-only-ceer.xml +++ b/workflow/sample_files/base-hvac-room-ac-only-ceer.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-room-ac-only.xml b/workflow/sample_files/base-hvac-room-ac-only.xml index 940a06716..e38a68a19 100644 --- a/workflow/sample_files/base-hvac-room-ac-only.xml +++ b/workflow/sample_files/base-hvac-room-ac-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-room-ac-with-heating.xml b/workflow/sample_files/base-hvac-room-ac-with-heating.xml index 6fd2c087a..49759deac 100644 --- a/workflow/sample_files/base-hvac-room-ac-with-heating.xml +++ b/workflow/sample_files/base-hvac-room-ac-with-heating.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml b/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml index 744eb9861..120de0ea9 100644 --- a/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml +++ b/workflow/sample_files/base-hvac-room-ac-with-reverse-cycle.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-space-heater-gas-only.xml b/workflow/sample_files/base-hvac-space-heater-gas-only.xml index 032aacebe..f3b84b2f5 100644 --- a/workflow/sample_files/base-hvac-space-heater-gas-only.xml +++ b/workflow/sample_files/base-hvac-space-heater-gas-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml b/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml index daec4b3a0..8fe0d4ca0 100644 --- a/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml +++ b/workflow/sample_files/base-hvac-stove-wood-pellets-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-undersized.xml b/workflow/sample_files/base-hvac-undersized.xml index af5fb69ee..d0b0877cc 100644 --- a/workflow/sample_files/base-hvac-undersized.xml +++ b/workflow/sample_files/base-hvac-undersized.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml b/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml index 4d77f211f..0a6e681e7 100644 --- a/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml +++ b/workflow/sample_files/base-hvac-wall-furnace-elec-only.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml b/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml index b04020308..dae90b0d6 100644 --- a/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml +++ b/workflow/sample_files/base-lighting-ceiling-fans-label-energy-use.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-lighting-ceiling-fans.xml b/workflow/sample_files/base-lighting-ceiling-fans.xml index a9c3843e5..5cc51aa27 100644 --- a/workflow/sample_files/base-lighting-ceiling-fans.xml +++ b/workflow/sample_files/base-lighting-ceiling-fans.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-location-baltimore-md.xml b/workflow/sample_files/base-location-baltimore-md.xml index 1928ecbcc..28b608436 100644 --- a/workflow/sample_files/base-location-baltimore-md.xml +++ b/workflow/sample_files/base-location-baltimore-md.xml @@ -58,14 +58,6 @@ 2006 4A - - 2024 - 4A - - - 2021 - 4A - USA_MD_Baltimore-Washington.Intl.AP.724060_TMY3 diff --git a/workflow/sample_files/base-location-capetown-zaf.xml b/workflow/sample_files/base-location-capetown-zaf.xml index 501d6e7b5..69242b2cb 100644 --- a/workflow/sample_files/base-location-capetown-zaf.xml +++ b/workflow/sample_files/base-location-capetown-zaf.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - ZAF_Cape.Town.688160_IWEC diff --git a/workflow/sample_files/base-location-dallas-tx.xml b/workflow/sample_files/base-location-dallas-tx.xml index f9eaf11cf..c44567897 100644 --- a/workflow/sample_files/base-location-dallas-tx.xml +++ b/workflow/sample_files/base-location-dallas-tx.xml @@ -58,14 +58,6 @@ 2006 3A - - 2024 - 3A - - - 2021 - 3A - USA_TX_Dallas-Fort.Worth.Intl.AP.722590_TMY3 diff --git a/workflow/sample_files/base-location-duluth-mn.xml b/workflow/sample_files/base-location-duluth-mn.xml index 3925d1663..d3d134e72 100644 --- a/workflow/sample_files/base-location-duluth-mn.xml +++ b/workflow/sample_files/base-location-duluth-mn.xml @@ -58,14 +58,6 @@ 2006 7 - - 2024 - 7 - - - 2021 - 7 - USA_MN_Duluth.Intl.AP.727450_TMY3 diff --git a/workflow/sample_files/base-location-helena-mt.xml b/workflow/sample_files/base-location-helena-mt.xml index 5cfca1bb3..a32404530 100644 --- a/workflow/sample_files/base-location-helena-mt.xml +++ b/workflow/sample_files/base-location-helena-mt.xml @@ -58,14 +58,6 @@ 2006 6B - - 2024 - 6B - - - 2021 - 6B - USA_MT_Helena.Rgnl.AP.727720_TMY3 diff --git a/workflow/sample_files/base-location-honolulu-hi.xml b/workflow/sample_files/base-location-honolulu-hi.xml index b33179007..8d2b188f2 100644 --- a/workflow/sample_files/base-location-honolulu-hi.xml +++ b/workflow/sample_files/base-location-honolulu-hi.xml @@ -58,14 +58,6 @@ 2006 1A - - 2024 - 1A - - - 2021 - 1A - USA_HI_Honolulu.Intl.AP.911820_TMY3 diff --git a/workflow/sample_files/base-location-miami-fl.xml b/workflow/sample_files/base-location-miami-fl.xml index bebeba8b1..a7901c1a8 100644 --- a/workflow/sample_files/base-location-miami-fl.xml +++ b/workflow/sample_files/base-location-miami-fl.xml @@ -58,14 +58,6 @@ 2006 1A - - 2024 - 1A - - - 2021 - 1A - USA_FL_Miami.Intl.AP.722020_TMY3 diff --git a/workflow/sample_files/base-location-phoenix-az.xml b/workflow/sample_files/base-location-phoenix-az.xml index 920568100..5358f9d46 100644 --- a/workflow/sample_files/base-location-phoenix-az.xml +++ b/workflow/sample_files/base-location-phoenix-az.xml @@ -58,14 +58,6 @@ 2006 2B - - 2024 - 2B - - - 2021 - 2B - USA_AZ_Phoenix-Sky.Harbor.Intl.AP.722780_TMY3 diff --git a/workflow/sample_files/base-location-portland-or.xml b/workflow/sample_files/base-location-portland-or.xml index 832d4cf1a..511710378 100644 --- a/workflow/sample_files/base-location-portland-or.xml +++ b/workflow/sample_files/base-location-portland-or.xml @@ -58,14 +58,6 @@ 2006 4C - - 2024 - 4C - - - 2021 - 4C - USA_OR_Portland.Intl.AP.726980_TMY3 diff --git a/workflow/sample_files/base-mechvent-balanced.xml b/workflow/sample_files/base-mechvent-balanced.xml index 6c6ff9067..45a52063a 100644 --- a/workflow/sample_files/base-mechvent-balanced.xml +++ b/workflow/sample_files/base-mechvent-balanced.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml b/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml index 3a4a75b15..6ff9d3bd6 100644 --- a/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml +++ b/workflow/sample_files/base-mechvent-cfis-airflow-fraction-zero.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml b/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml index 6771848ea..5d7edb790 100644 --- a/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml +++ b/workflow/sample_files/base-mechvent-cfis-supplemental-fan-exhaust.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-cfis.xml b/workflow/sample_files/base-mechvent-cfis.xml index fc9009576..b00067b14 100644 --- a/workflow/sample_files/base-mechvent-cfis.xml +++ b/workflow/sample_files/base-mechvent-cfis.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-erv-atre-asre.xml b/workflow/sample_files/base-mechvent-erv-atre-asre.xml index f0d1cba3b..deed6bf93 100644 --- a/workflow/sample_files/base-mechvent-erv-atre-asre.xml +++ b/workflow/sample_files/base-mechvent-erv-atre-asre.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-erv.xml b/workflow/sample_files/base-mechvent-erv.xml index e28f0b5cc..f16a26e17 100644 --- a/workflow/sample_files/base-mechvent-erv.xml +++ b/workflow/sample_files/base-mechvent-erv.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-exhaust.xml b/workflow/sample_files/base-mechvent-exhaust.xml index 4e7a5addb..07f18d74b 100644 --- a/workflow/sample_files/base-mechvent-exhaust.xml +++ b/workflow/sample_files/base-mechvent-exhaust.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-hrv-asre.xml b/workflow/sample_files/base-mechvent-hrv-asre.xml index 4bf9693a0..8b4c6d3e0 100644 --- a/workflow/sample_files/base-mechvent-hrv-asre.xml +++ b/workflow/sample_files/base-mechvent-hrv-asre.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-hrv.xml b/workflow/sample_files/base-mechvent-hrv.xml index e36fd82f5..38adbf9cb 100644 --- a/workflow/sample_files/base-mechvent-hrv.xml +++ b/workflow/sample_files/base-mechvent-hrv.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-multiple.xml b/workflow/sample_files/base-mechvent-multiple.xml index f28985da3..618405556 100644 --- a/workflow/sample_files/base-mechvent-multiple.xml +++ b/workflow/sample_files/base-mechvent-multiple.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-supply.xml b/workflow/sample_files/base-mechvent-supply.xml index 751def540..34adcbd9e 100644 --- a/workflow/sample_files/base-mechvent-supply.xml +++ b/workflow/sample_files/base-mechvent-supply.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-mechvent-whole-house-fan.xml b/workflow/sample_files/base-mechvent-whole-house-fan.xml index f2f116cea..f9612c07c 100644 --- a/workflow/sample_files/base-mechvent-whole-house-fan.xml +++ b/workflow/sample_files/base-mechvent-whole-house-fan.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-misc-generators.xml b/workflow/sample_files/base-misc-generators.xml index cd29a0543..47c053584 100644 --- a/workflow/sample_files/base-misc-generators.xml +++ b/workflow/sample_files/base-misc-generators.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-pv-battery.xml b/workflow/sample_files/base-pv-battery.xml index 0992190ad..8b4b74241 100644 --- a/workflow/sample_files/base-pv-battery.xml +++ b/workflow/sample_files/base-pv-battery.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-pv.xml b/workflow/sample_files/base-pv.xml index cabc995c0..b9a7aa742 100644 --- a/workflow/sample_files/base-pv.xml +++ b/workflow/sample_files/base-pv.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-co2-2019ABCD.xml b/workflow/sample_files/base-version-co2-2019ABCD.xml index f1fc31d63..8d70680c6 100644 --- a/workflow/sample_files/base-version-co2-2019ABCD.xml +++ b/workflow/sample_files/base-version-co2-2019ABCD.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-co2-2022.xml b/workflow/sample_files/base-version-co2-2022.xml index 5855b1524..4f71d4260 100644 --- a/workflow/sample_files/base-version-co2-2022.xml +++ b/workflow/sample_files/base-version-co2-2022.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-co2-2022C.xml b/workflow/sample_files/base-version-co2-2022C.xml index a78450444..ba4e96ded 100644 --- a/workflow/sample_files/base-version-co2-2022C.xml +++ b/workflow/sample_files/base-version-co2-2022C.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2014.xml b/workflow/sample_files/base-version-eri-2014.xml index 424ee77f7..d4f4bc005 100644 --- a/workflow/sample_files/base-version-eri-2014.xml +++ b/workflow/sample_files/base-version-eri-2014.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2014A.xml b/workflow/sample_files/base-version-eri-2014A.xml index 14f69d75f..c4f7adeea 100644 --- a/workflow/sample_files/base-version-eri-2014A.xml +++ b/workflow/sample_files/base-version-eri-2014A.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2014AE.xml b/workflow/sample_files/base-version-eri-2014AE.xml index 6cd8ddb46..3c9cdf64f 100644 --- a/workflow/sample_files/base-version-eri-2014AE.xml +++ b/workflow/sample_files/base-version-eri-2014AE.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2014AEG.xml b/workflow/sample_files/base-version-eri-2014AEG.xml index c3109bce5..55cf10878 100644 --- a/workflow/sample_files/base-version-eri-2014AEG.xml +++ b/workflow/sample_files/base-version-eri-2014AEG.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2019.xml b/workflow/sample_files/base-version-eri-2019.xml index 4d88a7b87..bff70922f 100644 --- a/workflow/sample_files/base-version-eri-2019.xml +++ b/workflow/sample_files/base-version-eri-2019.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2019A.xml b/workflow/sample_files/base-version-eri-2019A.xml index 9641f5287..671534b87 100644 --- a/workflow/sample_files/base-version-eri-2019A.xml +++ b/workflow/sample_files/base-version-eri-2019A.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2019AB.xml b/workflow/sample_files/base-version-eri-2019AB.xml index db3c8fd7f..5ebef5231 100644 --- a/workflow/sample_files/base-version-eri-2019AB.xml +++ b/workflow/sample_files/base-version-eri-2019AB.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2019ABC.xml b/workflow/sample_files/base-version-eri-2019ABC.xml index 5a35dd551..cfe32bad4 100644 --- a/workflow/sample_files/base-version-eri-2019ABC.xml +++ b/workflow/sample_files/base-version-eri-2019ABC.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2019ABCD.xml b/workflow/sample_files/base-version-eri-2019ABCD.xml index 0b30aee06..aa90fe0cc 100644 --- a/workflow/sample_files/base-version-eri-2019ABCD.xml +++ b/workflow/sample_files/base-version-eri-2019ABCD.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2022.xml b/workflow/sample_files/base-version-eri-2022.xml index 2168062ce..f670b7b7e 100644 --- a/workflow/sample_files/base-version-eri-2022.xml +++ b/workflow/sample_files/base-version-eri-2022.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-eri-2022C.xml b/workflow/sample_files/base-version-eri-2022C.xml index 258393342..f1fd9d36e 100644 --- a/workflow/sample_files/base-version-eri-2022C.xml +++ b/workflow/sample_files/base-version-eri-2022C.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-iecc-eri-2015.xml b/workflow/sample_files/base-version-iecc-eri-2015.xml index dfce9880f..b2300c5cc 100644 --- a/workflow/sample_files/base-version-iecc-eri-2015.xml +++ b/workflow/sample_files/base-version-iecc-eri-2015.xml @@ -46,18 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - - - 2015 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-iecc-eri-2018.xml b/workflow/sample_files/base-version-iecc-eri-2018.xml index 7237d324a..972266a13 100644 --- a/workflow/sample_files/base-version-iecc-eri-2018.xml +++ b/workflow/sample_files/base-version-iecc-eri-2018.xml @@ -46,18 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - - - 2018 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-iecc-eri-2021.xml b/workflow/sample_files/base-version-iecc-eri-2021.xml index e81c63f63..a05222b5b 100644 --- a/workflow/sample_files/base-version-iecc-eri-2021.xml +++ b/workflow/sample_files/base-version-iecc-eri-2021.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base-version-iecc-eri-2024.xml b/workflow/sample_files/base-version-iecc-eri-2024.xml index 6143686d2..90411ed5c 100644 --- a/workflow/sample_files/base-version-iecc-eri-2024.xml +++ b/workflow/sample_files/base-version-iecc-eri-2024.xml @@ -46,14 +46,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/sample_files/base.xml b/workflow/sample_files/base.xml index fafc486e3..09b696aad 100644 --- a/workflow/sample_files/base.xml +++ b/workflow/sample_files/base.xml @@ -58,14 +58,6 @@ 2006 5B - - 2024 - 5B - - - 2021 - 5B - USA_CO_Denver.Intl.AP.725650_TMY3 diff --git a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ2_FL_gas_ground_corner_slab.xml b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ2_FL_gas_ground_corner_slab.xml index 513fbdf0e..0f8dfb2e0 100644 --- a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ2_FL_gas_ground_corner_slab.xml +++ b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ2_FL_gas_ground_corner_slab.xml @@ -46,10 +46,6 @@ 2006 2A - - 2021 - 2A - Tampa, FL diff --git a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ4_MO_gas_top_corner.xml b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ4_MO_gas_top_corner.xml index d50c36eed..5ad197d31 100644 --- a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ4_MO_gas_top_corner.xml +++ b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ4_MO_gas_top_corner.xml @@ -46,10 +46,6 @@ 2006 4A - - 2021 - 4A - St Louis, MO diff --git a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ6_VT_elec_middle_interior.xml b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ6_VT_elec_middle_interior.xml index ac1fa3c86..57a08e355 100644 --- a/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ6_VT_elec_middle_interior.xml +++ b/workflow/tests/EPA_Tests/MF_National_1.2/MFNCv12_CZ6_VT_elec_middle_interior.xml @@ -45,10 +45,6 @@ 2006 6A - - 2021 - 6A - Burlington, VT diff --git a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ2_FL_gas_slab.xml b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ2_FL_gas_slab.xml index 22fa27d6a..bd910b9d3 100644 --- a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ2_FL_gas_slab.xml +++ b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ2_FL_gas_slab.xml @@ -46,10 +46,6 @@ 2006 2A - - 2021 - 2A - Tampa, FL diff --git a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ4_MO_gas_vented_crawl.xml b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ4_MO_gas_vented_crawl.xml index 2dace07f5..255dc746e 100644 --- a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ4_MO_gas_vented_crawl.xml +++ b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ4_MO_gas_vented_crawl.xml @@ -46,10 +46,6 @@ 2006 4A - - 2021 - 4A - St Louis, MO diff --git a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ6_VT_elec_cond_bsmt.xml b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ6_VT_elec_cond_bsmt.xml index 20b956c25..f117fe82c 100644 --- a/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ6_VT_elec_cond_bsmt.xml +++ b/workflow/tests/EPA_Tests/SF_National_3.2/SFNHv32_CZ6_VT_elec_cond_bsmt.xml @@ -45,10 +45,6 @@ 2006 6A - - 2021 - 6A - Burlington, VT From bb1695adc920f00a70455c653bd43be5184cac12 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Fri, 6 Sep 2024 11:25:53 -0600 Subject: [PATCH 2/5] Squashed 'hpxml-measures/' changes from 4362479261..672bf87b89 672bf87b89 Update docs 4b905c0513 Minor refactor of Waterheater.get_default_location method to simplify the arguments. 80b39ec2b1 Merge pull request #1822 from NREL/reduce-advanced-feature-simulations 1c2e9bb48a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations de2a7767b1 Latest results. 78c464b7e6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations 0370ffb18e fix unit test 8bb6e6cafe update measures 40bd2abf84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations ad00017bff Added 2 speed system test file back, changed var speed system test file to be hourly 5dde4bb4eb Latest results. 7202d1bbe0 Reduce number of sample files with 1-minute timesteps to speed up CI jobs. git-subtree-dir: hpxml-measures git-subtree-split: 672bf87b896248b5484ea25fc896d39794cbfa3e --- HPXMLtoOpenStudio/measure.xml | 12 +- HPXMLtoOpenStudio/resources/hpxml_defaults.rb | 6 +- HPXMLtoOpenStudio/resources/waterheater.rb | 10 +- HPXMLtoOpenStudio/tests/test_hvac.rb | 40 +- HPXMLtoOpenStudio/tests/test_validation.rb | 2 +- docs/source/workflow_inputs.rst | 2 +- workflow/hpxml_inputs.json | 41 +- ...lockout-temperatures-research-features.xml | 566 ------------------ ...ir-heat-pump-1-speed-research-features.xml | 7 +- ...-heat-pump-var-speed-research-features.xml | 13 +- ...tral-ac-only-2-speed-research-features.xml | 538 ----------------- ...y-research-features-detailed-setpoints.xml | 500 ---------------- ...se-hvac-room-ac-only-research-features.xml | 4 +- .../results_simulations_bills.csv | 9 +- .../results_simulations_energy.csv | 9 +- .../base_results/results_simulations_hvac.csv | 5 +- .../results_simulations_loads.csv | 9 +- .../base_results/results_simulations_misc.csv | 9 +- .../tests/base_results/results_sizing.csv | 16 - 19 files changed, 51 insertions(+), 1747 deletions(-) delete mode 100644 workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml delete mode 100644 workflow/sample_files/base-hvac-central-ac-only-2-speed-research-features.xml delete mode 100644 workflow/sample_files/base-hvac-room-ac-only-research-features-detailed-setpoints.xml diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml index 2bd08bf08..0c0cce186 100644 --- a/HPXMLtoOpenStudio/measure.xml +++ b/HPXMLtoOpenStudio/measure.xml @@ -3,8 +3,8 @@ 3.1 hpxm_lto_openstudio b1543b30-9465-45ff-ba04-1d1f85e763bc - 057ab6b7-cc47-4997-a94d-bfd8ce074486 - 2024-09-06T15:48:09Z + 3b678540-7b41-4cda-8eb9-a829bb0c5fe4 + 2024-09-06T17:17:54Z D8922A73 HPXMLtoOpenStudio HPXML to OpenStudio Translator @@ -363,7 +363,7 @@ hpxml_defaults.rb rb resource - 0F6B9DD0 + 92BB7113 hpxml_schema/HPXML.xsd @@ -621,7 +621,7 @@ waterheater.rb rb resource - 367FF6D6 + 20E8AE0A weather.rb @@ -681,7 +681,7 @@ test_hvac.rb rb test - 84D82F35 + A3E4F5E8 test_hvac_sizing.rb @@ -729,7 +729,7 @@ test_validation.rb rb test - ABE770EA + A0D2EEB9 test_water_heater.rb diff --git a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb index 71f3410bd..14f9c06a8 100644 --- a/HPXMLtoOpenStudio/resources/hpxml_defaults.rb +++ b/HPXMLtoOpenStudio/resources/hpxml_defaults.rb @@ -2560,7 +2560,8 @@ def self.apply_hvac_location(hpxml_bldg) end elsif dist_type == HPXML::HVACDistributionTypeHydronic # Assume same default logic as a water heater - hvac_system.location = Waterheater.get_default_location(hpxml_bldg, hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0]) + iecc_zone = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.empty? ? nil : hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone + hvac_system.location = Waterheater.get_default_location(hpxml_bldg, iecc_zone) elsif dist_type == HPXML::HVACDistributionTypeDSE # DSE=1 implies distribution system in conditioned space has_dse_of_one = true @@ -2754,7 +2755,8 @@ def self.apply_water_heaters(hpxml_bldg, nbeds, eri_version, schedules_file) end end if water_heating_system.location.nil? - water_heating_system.location = Waterheater.get_default_location(hpxml_bldg, hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0]) + iecc_zone = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.empty? ? nil : hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone + water_heating_system.location = Waterheater.get_default_location(hpxml_bldg, iecc_zone) water_heating_system.location_isdefaulted = true end next unless water_heating_system.usage_bin.nil? && (not water_heating_system.uniform_energy_factor.nil?) # FHR & UsageBin only applies to UEF diff --git a/HPXMLtoOpenStudio/resources/waterheater.rb b/HPXMLtoOpenStudio/resources/waterheater.rb index 9581ee5d0..937706ad6 100644 --- a/HPXMLtoOpenStudio/resources/waterheater.rb +++ b/HPXMLtoOpenStudio/resources/waterheater.rb @@ -1698,13 +1698,13 @@ def self.get_default_performance_adjustment(water_heating_system) end end - # TODO + # Returns the default location of the water heater based on the IECC climate zone. # # @param hpxml_bldg [HPXML::Building] HPXML Building object representing an individual dwelling unit - # @param climate_zone_iecc [TODO] TODO - # @return [TODO] TODO - def self.get_default_location(hpxml_bldg, climate_zone_iecc) - iecc_zone = (climate_zone_iecc.nil? ? nil : climate_zone_iecc.zone) + # @param iecc_zone [string] IECC climate zone + # @return [string] Water heater location (HPXML::LocationXXX) + def self.get_default_location(hpxml_bldg, iecc_zone = nil) + # ANSI/RESNET/ICC 301-2022C if ['1A', '1B', '1C', '2A', '2B', '2C', '3A', '3B', '3C'].include? iecc_zone location_hierarchy = [HPXML::LocationGarage, HPXML::LocationConditionedSpace] diff --git a/HPXMLtoOpenStudio/tests/test_hvac.rb b/HPXMLtoOpenStudio/tests/test_hvac.rb index 79cd19727..3d1fca134 100644 --- a/HPXMLtoOpenStudio/tests/test_hvac.rb +++ b/HPXMLtoOpenStudio/tests/test_hvac.rb @@ -519,8 +519,7 @@ def test_air_to_air_heat_pump_1_speed def test_air_to_air_heat_pump_multistage_backup_system ['base-hvac-air-to-air-heat-pump-1-speed-research-features.xml', - 'base-hvac-air-to-air-heat-pump-2-speed-research-features.xml', - 'base-hvac-air-to-air-heat-pump-var-speed-research-features.xml'].each do |hpxml_path| + 'base-hvac-air-to-air-heat-pump-2-speed-research-features.xml'].each do |hpxml_path| args_hash = {} args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, hpxml_path)) model, _hpxml, hpxml_bldg = _test_measure(args_hash) @@ -746,7 +745,7 @@ def test_air_to_air_heat_pump_var_speed_max_power_ratio assert_equal(2, htg_coil.stages.size) # Check supp heating coil - assert_equal(1, model.getCoilHeatingElectricMultiStages.size) + assert_equal(1, model.getCoilHeatingElectrics.size) # Check EMS assert_equal(1, model.getAirLoopHVACUnitarySystems.size) @@ -809,7 +808,7 @@ def test_air_to_air_heat_pump_1_speed_onoff_thermostat # Onoff thermostat with detailed setpoints args_hash = {} - args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-hvac-room-ac-only-research-features-detailed-setpoints.xml')) + args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-hvac-room-ac-only-research-features.xml')) model, hpxml, _hpxml_bldg = _test_measure(args_hash) # Check cooling coil @@ -827,37 +826,6 @@ def test_air_to_air_heat_pump_1_speed_onoff_thermostat _check_onoff_thermostat_EMS(model, clg_coil, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0) end - def test_air_to_air_heat_pump_2_speed_onoff_thermostat - args_hash = {} - args_hash['hpxml_path'] = File.absolute_path(File.join(@sample_files_path, 'base-hvac-air-to-air-heat-pump-2-speed-research-features.xml')) - model, hpxml, _hpxml_bldg = _test_measure(args_hash) - - # Check cooling coil - assert_equal(1, model.getCoilCoolingDXMultiSpeeds.size) - clg_coil = model.getCoilCoolingDXMultiSpeeds[0] - - # Check heating coil - assert_equal(1, model.getCoilHeatingDXMultiSpeeds.size) - htg_coil = model.getCoilHeatingDXMultiSpeeds[0] - - # Check supp heating coil - assert_equal(1, model.getCoilHeatingElectricMultiStages.size) - - # E+ thermostat - onoff_thermostat_deadband = hpxml.header.hvac_onoff_thermostat_deadband - assert_equal(1, model.getThermostatSetpointDualSetpoints.size) - thermostat_setpoint = model.getThermostatSetpointDualSetpoints[0] - assert_in_epsilon(UnitConversions.convert(onoff_thermostat_deadband, 'deltaF', 'deltaC'), thermostat_setpoint.temperatureDifferenceBetweenCutoutAndSetpoint) - - # Check EMS - assert_equal(1, model.getAirLoopHVACUnitarySystems.size) - _check_onoff_thermostat_EMS(model, htg_coil, 0.741, 0.379, -0.120, 2.154, -1.737, 0.584) - _check_onoff_thermostat_EMS(model, clg_coil, 0.655, 0.512, -0.167, 1.639, -0.999, 0.360) - # realistic staging EMS is hard to check values - program_values = get_ems_values(model.getEnergyManagementSystemPrograms, "#{model.getAirLoopHVACUnitarySystems[0].name} realistic cycling", true) - assert(!program_values.empty?) # Check EMS program - end - def test_heat_pump_advanced_defrost # Var Speed heat pump test args_hash = {} @@ -871,7 +839,7 @@ def test_heat_pump_advanced_defrost assert_equal(1, model.getCoilHeatingDXMultiSpeeds.size) htg_coil = model.getCoilHeatingDXMultiSpeeds[0] # q_dot smaller than backup capacity - _check_advanced_defrost(model, htg_coil, 4747.75, 4747.75, backup_fuel, 0.06667, 1067.05) + _check_advanced_defrost(model, htg_coil, 4747.75, 4747.75, backup_fuel, 0.06667, 1199.87) # Single Speed heat pump test args_hash = {} diff --git a/HPXMLtoOpenStudio/tests/test_validation.rb b/HPXMLtoOpenStudio/tests/test_validation.rb index 950dc3797..8a73b2b34 100644 --- a/HPXMLtoOpenStudio/tests/test_validation.rb +++ b/HPXMLtoOpenStudio/tests/test_validation.rb @@ -178,7 +178,7 @@ def test_schema_schematron_error_messages 'invalid-id2' => ["Element 'SystemIdentifier': The attribute 'id' is required but missing."], 'invalid-input-parameters' => ["Element 'Transaction': [facet 'enumeration'] The value 'modify' is not an element of the set {'create', 'update'}.", "Element 'SiteType': [facet 'enumeration'] The value 'mountain' is not an element of the set {'rural', 'suburban', 'urban'}.", - "Element 'Year': [facet 'enumeration'] The value '2020' is not an element of the set {'2021', '2018', '2015', '2012', '2009', '2006', '2003'}.", + "Element 'Year': [facet 'enumeration'] The value '2020' is not an element of the set {'2024', '2021', '2018', '2015', '2012', '2009', '2006', '2003'}.", "Element 'Azimuth': [facet 'maxExclusive'] The value '365' must be less than '360'.", "Element 'RadiantBarrierGrade': [facet 'maxInclusive'] The value '4' is greater than the maximum value allowed ('3').", "Element 'EnergyFactor': [facet 'maxInclusive'] The value '5.1' is greater than the maximum value allowed ('5')."], diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst index 4a7e9251b..c05f426bf 100644 --- a/docs/source/workflow_inputs.rst +++ b/docs/source/workflow_inputs.rst @@ -929,7 +929,7 @@ Climate zone information can be optionally entered as an ``/HPXML/Building/Build ``ClimateZone`` string See [#]_ Yes IECC zone ================================= ======== ===== =========== ======== ======== =============== - .. [#] Year choices are 2003, 2006, 2009, 2012, 2015, 2018, or 2021. + .. [#] Year choices are 2003, 2006, 2009, 2012, 2015, 2018, 2021, or 2024. .. [#] ClimateZone choices are "1A", "1B", "1C", "2A", "2B", "2C", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "6C", "7", or "8". If Climate zone information not provided, defaults according to the EPW weather file header. diff --git a/workflow/hpxml_inputs.json b/workflow/hpxml_inputs.json index 4d06befb3..10b88d537 100644 --- a/workflow/hpxml_inputs.json +++ b/workflow/hpxml_inputs.json @@ -2005,19 +2005,8 @@ "hvac_control_heating_weekday_setpoint": "64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64", "hvac_control_heating_weekend_setpoint": "64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64" }, - "sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml": { - "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml", - "site_iecc_zone": 7, - "site_state_code": "MN", - "weather_station_epw_filepath": "USA_MN_Duluth.Intl.AP.727450_TMY3.epw", - "simulation_control_timestep": 1, - "heat_pump_backup_heating_capacity": 34121.4, - "simulation_control_onoff_thermostat_deadband": 2, - "simulation_control_heat_pump_backup_heating_capacity_increment": 17060.71, - "simulation_control_defrost_model_type": "advanced" - }, "sample_files/base-hvac-air-to-air-heat-pump-1-speed-research-features.xml": { - "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml", + "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml", "site_iecc_zone": 7, "site_state_code": "MN", "weather_station_epw_filepath": "USA_MN_Duluth.Intl.AP.727450_TMY3.epw", @@ -2040,17 +2029,6 @@ "heat_pump_cooling_efficiency": 18, "heat_pump_cooling_compressor_type": "two stage" }, - "sample_files/base-hvac-air-to-air-heat-pump-2-speed-research-features.xml": { - "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-2-speed.xml", - "site_iecc_zone": 7, - "site_state_code": "MN", - "weather_station_epw_filepath": "USA_MN_Duluth.Intl.AP.727450_TMY3.epw", - "simulation_control_timestep": 1, - "simulation_control_onoff_thermostat_deadband": 2, - "heat_pump_backup_heating_capacity": 34121.4, - "simulation_control_heat_pump_backup_heating_capacity_increment": 17060.71, - "simulation_control_defrost_model_type": "advanced" - }, "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml": { "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-1-speed.xml", "heat_pump_heating_efficiency": 10, @@ -2109,13 +2087,8 @@ }, "sample_files/base-hvac-air-to-air-heat-pump-var-speed-research-features.xml": { "parent_hpxml": "sample_files/base-hvac-air-to-air-heat-pump-var-speed.xml", - "site_iecc_zone": 7, - "site_state_code": "MN", - "weather_station_epw_filepath": "USA_MN_Duluth.Intl.AP.727450_TMY3.epw", "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/hvac-variable-system-maximum-power-ratios-varied.csv", - "simulation_control_timestep": 1, - "heat_pump_backup_heating_capacity": 34121.4, - "simulation_control_heat_pump_backup_heating_capacity_increment": 17060.71, + "simulation_control_timestep": 60, "simulation_control_defrost_model_type": "advanced" }, "sample_files/base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml": { @@ -2261,11 +2234,6 @@ "cooling_system_cooling_efficiency": 18, "cooling_system_cooling_compressor_type": "two stage" }, - "sample_files/base-hvac-central-ac-only-2-speed-research-features.xml": { - "parent_hpxml": "sample_files/base-hvac-central-ac-only-2-speed.xml", - "simulation_control_timestep": 1, - "simulation_control_onoff_thermostat_deadband": 2 - }, "sample_files/base-hvac-central-ac-only-var-speed.xml": { "parent_hpxml": "sample_files/base-hvac-central-ac-only-1-speed.xml", "cooling_system_cooling_efficiency": 24, @@ -2929,11 +2897,6 @@ "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-cooling-only.csv" }, "sample_files/base-hvac-room-ac-only-research-features.xml": { - "parent_hpxml": "sample_files/base-hvac-room-ac-only.xml", - "simulation_control_timestep": 1, - "simulation_control_onoff_thermostat_deadband": 2 - }, - "sample_files/base-hvac-room-ac-only-research-features-detailed-setpoints.xml": { "parent_hpxml": "sample_files/base-hvac-room-ac-only-detailed-setpoints.xml", "simulation_control_timestep": 1, "simulation_control_onoff_thermostat_deadband": 2 diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml deleted file mode 100644 index 75f237733..000000000 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml +++ /dev/null @@ -1,566 +0,0 @@ - - - - HPXML - tasks.rb - 2000-01-01T00:00:00-07:00 - create - - - - - 1 - - advanced - 2.0 - 17060.71 - - - - - Bills - - - - - - - - -
- MN -
- - - 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 - 7 - - - - USA_MN_Duluth.Intl.AP.727450_TMY3 - - USA_MN_Duluth.Intl.AP.727450_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 - - - - - - - - - - - - - - air-to-air - electricity - 36000.0 - 36000.0 - single stage - 5.0 - 0.73 - integrated - electricity - - Percent - 1.0 - - 34121.4 - 35.0 - 1.0 - 1.0 - - SEER - 13.0 - - - HSPF - 7.7 - - - - 0.6 - 17.0 - - - - - - - 78.0 - - 64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64 - 64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64 - - - - - - - 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 - - - - - - - - - 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/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-research-features.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-research-features.xml index 66b8e23c0..75f237733 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-research-features.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-1-speed-research-features.xml @@ -333,6 +333,7 @@ 36000.0 36000.0 single stage + 5.0 0.73 integrated electricity @@ -341,6 +342,7 @@ 1.0 34121.4 + 35.0 1.0 1.0 @@ -361,8 +363,11 @@ - 68.0 78.0 + + 64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64 + 64, 64, 64, 64, 64, 64, 64, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 70, 64, 64 + diff --git a/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-research-features.xml b/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-research-features.xml index fa45833e0..6ac8cab1a 100644 --- a/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-research-features.xml +++ b/workflow/sample_files/base-hvac-air-to-air-heat-pump-var-speed-research-features.xml @@ -9,10 +9,9 @@ - 1 + 60 advanced - 17060.71 @@ -27,7 +26,7 @@
- MN + CO
@@ -62,13 +61,13 @@ 2006 - 7 + 5B - USA_MN_Duluth.Intl.AP.727450_TMY3 + USA_CO_Denver.Intl.AP.725650_TMY3 - USA_MN_Duluth.Intl.AP.727450_TMY3.epw + USA_CO_Denver.Intl.AP.725650_TMY3.epw @@ -342,7 +341,7 @@ Percent 1.0 - 34121.4 + 36000.0 1.0 1.0 diff --git a/workflow/sample_files/base-hvac-central-ac-only-2-speed-research-features.xml b/workflow/sample_files/base-hvac-central-ac-only-2-speed-research-features.xml deleted file mode 100644 index a5e2f560f..000000000 --- a/workflow/sample_files/base-hvac-central-ac-only-2-speed-research-features.xml +++ /dev/null @@ -1,538 +0,0 @@ - - - - HPXML - tasks.rb - 2000-01-01T00:00:00-07:00 - create - - - - - 1 - - 2.0 - - - - - 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 - - - - - - - - - - - - - central air conditioner - electricity - 24000.0 - two stage - 1.0 - - SEER - 18.0 - - 0.73 - - - - - 78.0 - - - - - - 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 - - - - - - - - - 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/workflow/sample_files/base-hvac-room-ac-only-research-features-detailed-setpoints.xml b/workflow/sample_files/base-hvac-room-ac-only-research-features-detailed-setpoints.xml deleted file mode 100644 index 9fd6c94e8..000000000 --- a/workflow/sample_files/base-hvac-room-ac-only-research-features-detailed-setpoints.xml +++ /dev/null @@ -1,500 +0,0 @@ - - - - HPXML - tasks.rb - 2000-01-01T00:00:00-07:00 - create - - - - - 1 - - 2.0 - - - - - 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 - - - ../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-cooling-only.csv - - - - - 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 - - - - - - - - - - - - room air conditioner - electricity - 24000.0 - 1.0 - - EER - 8.5 - - 0.65 - - - - - - - - - - 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/workflow/sample_files/base-hvac-room-ac-only-research-features.xml b/workflow/sample_files/base-hvac-room-ac-only-research-features.xml index 0dcf41441..9fd6c94e8 100644 --- a/workflow/sample_files/base-hvac-room-ac-only-research-features.xml +++ b/workflow/sample_files/base-hvac-room-ac-only-research-features.xml @@ -54,6 +54,9 @@ 2700.0 21600.0 + + ../../HPXMLtoOpenStudio/resources/schedule_files/setpoints-cooling-only.csv + @@ -337,7 +340,6 @@ - 78.0 diff --git a/workflow/tests/base_results/results_simulations_bills.csv b/workflow/tests/base_results/results_simulations_bills.csv index 3b160880b..749d927d1 100644 --- a/workflow/tests/base_results/results_simulations_bills.csv +++ b/workflow/tests/base_results/results_simulations_bills.csv @@ -189,9 +189,8 @@ base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,1788.97,144.0,1644.97 base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,1389.42,144.0,1245.42,0.0,1389.42,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,1830.17,144.0,1686.17,0.0,1830.17,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,1676.62,144.0,1532.62,0.0,1676.62,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml,3346.35,144.0,3202.35,0.0,3346.35,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,1861.13,144.0,1717.13,0.0,1861.13,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,3263.02,144.0,3119.02,0.0,3263.02,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,3346.35,144.0,3202.35,0.0,3346.35,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml,1832.44,144.0,1688.44,0.0,1832.44,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-1-speed.xml,1830.17,144.0,1686.17,0.0,1830.17,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,3065.84,144.0,2921.84,0.0,3065.84,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -210,7 +209,7 @@ base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,1704.81,144.0,1560.81,0.0,1704.81,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml,1654.73,144.0,1510.73,0.0,1654.73,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml,1692.15,144.0,1548.15,0.0,1692.15,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,2950.37,144.0,2806.37,0.0,2950.37,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, +base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,1706.64,144.0,1562.64,0.0,1706.64,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-air-to-air-heat-pump-var-speed.xml,1647.35,144.0,1503.35,0.0,1647.35,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-autosize-sizing-controls.xml,1890.99,144.0,1522.19,0.0,1666.19,144.0,80.8,224.8,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-autosize.xml,1837.88,144.0,1296.78,0.0,1440.78,144.0,253.1,397.1,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -225,7 +224,6 @@ base-hvac-boiler-wood-only.xml,1479.26,144.0,1104.2,0.0,1248.2,0.0,0.0,0.0,0.0,0 base-hvac-central-ac-only-1-speed-autosize-factor.xml,1417.34,144.0,1273.34,0.0,1417.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-central-ac-only-1-speed-seer2.xml,1428.28,144.0,1284.28,0.0,1428.28,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-central-ac-only-1-speed.xml,1428.75,144.0,1284.75,0.0,1428.75,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, -base-hvac-central-ac-only-2-speed-research-features.xml,1370.46,144.0,1226.46,0.0,1370.46,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-central-ac-only-2-speed.xml,1368.61,144.0,1224.61,0.0,1368.61,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,1383.1,144.0,1239.1,0.0,1383.1,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, base-hvac-central-ac-only-var-speed-detailed-performance.xml,1359.28,144.0,1215.28,0.0,1359.28,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, @@ -317,8 +315,7 @@ base-hvac-pthp.xml,1669.25,144.0,1525.25,0.0,1669.25,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only-33percent.xml,1301.56,144.0,1157.56,0.0,1301.56,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only-ceer.xml,1423.34,144.0,1279.34,0.0,1423.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only-detailed-setpoints.xml,1379.28,144.0,1235.28,0.0,1379.28,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-room-ac-only-research-features-detailed-setpoints.xml,1361.34,144.0,1217.34,0.0,1361.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-room-ac-only-research-features.xml,1400.56,144.0,1256.56,0.0,1400.56,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +base-hvac-room-ac-only-research-features.xml,1361.34,144.0,1217.34,0.0,1361.34,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only.xml,1422.98,144.0,1278.98,0.0,1422.98,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-with-heating.xml,2061.47,144.0,1917.47,0.0,2061.47,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-with-reverse-cycle.xml,1669.25,144.0,1525.25,0.0,1669.25,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 diff --git a/workflow/tests/base_results/results_simulations_energy.csv b/workflow/tests/base_results/results_simulations_energy.csv index e57241969..52cd15eb5 100644 --- a/workflow/tests/base_results/results_simulations_energy.csv +++ b/workflow/tests/base_results/results_simulations_energy.csv @@ -189,9 +189,8 @@ base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,45.192,45.192,45.192, base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,34.215,34.215,34.215,34.215,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.386,0.801,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,46.324,46.324,46.324,46.324,0.0,0.0,0.0,0.0,0.0,0.0,9.887,1.648,0.298,0.026,3.487,0.826,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,42.106,42.106,42.106,42.106,0.0,0.0,0.0,0.0,0.0,0.0,9.801,1.769,0.3,0.03,0.0,0.0,8.993,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.147,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml,85.5,85.5,85.5,85.5,0.0,0.0,0.0,0.0,0.0,0.0,18.105,1.899,31.924,0.86,0.401,0.102,11.133,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.009,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,47.175,47.175,47.175,47.175,0.0,0.0,0.0,0.0,0.0,0.0,9.387,1.442,1.903,0.114,3.376,0.798,9.013,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.076,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,83.275,83.275,83.275,83.275,0.0,0.0,0.0,0.0,0.0,0.0,20.727,2.339,26.781,0.69,0.421,0.107,11.133,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.012,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,85.5,85.5,85.5,85.5,0.0,0.0,0.0,0.0,0.0,0.0,18.105,1.899,31.924,0.86,0.401,0.102,11.133,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.009,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml,46.387,46.387,46.387,46.387,0.0,0.0,0.0,0.0,0.0,0.0,9.962,1.648,0.298,0.026,3.475,0.826,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-1-speed.xml,46.324,46.324,46.324,46.324,0.0,0.0,0.0,0.0,0.0,0.0,9.887,1.648,0.298,0.026,3.487,0.826,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,78.01,78.01,78.01,78.01,0.0,0.0,0.0,0.0,0.0,0.0,16.873,1.438,26.643,0.527,0.256,0.063,11.133,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.011,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 @@ -210,7 +209,7 @@ base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,42.88,42.88,42.88,42.88,0.0,0.0,0.0,0.0,0.0,0.0,9.12,0.812,0.089,0.005,2.605,0.097,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml,41.504,41.504,41.504,41.504,0.0,0.0,0.0,0.0,0.0,0.0,8.21,0.478,0.37,0.018,2.17,0.105,9.016,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml,42.532,42.532,42.532,42.532,0.0,0.0,0.0,0.0,0.0,0.0,9.74,0.25,0.033,0.003,2.261,0.094,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,74.928,74.928,74.928,74.928,0.0,0.0,0.0,0.0,0.0,0.0,20.953,1.639,19.416,0.383,0.317,0.014,11.135,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.006,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,42.93,42.93,42.93,42.93,0.0,0.0,0.0,0.0,0.0,0.0,8.341,0.464,1.761,0.016,2.1,0.098,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.071,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-air-to-air-heat-pump-var-speed.xml,41.301,41.301,41.301,41.301,0.0,0.0,0.0,0.0,0.0,0.0,8.218,0.418,0.295,0.02,2.1,0.098,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-autosize-sizing-controls.xml,49.537,49.537,41.819,41.819,7.718,0.0,0.0,0.0,0.0,0.0,0.0,0.049,0.0,0.0,3.055,0.403,15.739,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.965,0.0,0.0,0.398,0.515,2.133,2.222,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,7.718,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-autosize.xml,59.805,59.805,35.626,35.626,24.178,0.0,0.0,0.0,0.0,0.0,0.0,0.446,0.0,0.0,4.372,0.657,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,24.178,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 @@ -225,7 +224,6 @@ base-hvac-boiler-wood-only.xml,50.604,50.604,30.336,30.336,0.0,0.0,0.0,20.268,0. base-hvac-central-ac-only-1-speed-autosize-factor.xml,34.983,34.983,34.983,34.983,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.107,0.846,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-central-ac-only-1-speed-seer2.xml,35.283,35.283,35.283,35.283,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.346,0.908,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-central-ac-only-1-speed.xml,35.296,35.296,35.296,35.296,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.359,0.908,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-central-ac-only-2-speed-research-features.xml,33.694,33.694,33.694,33.694,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.114,0.553,9.062,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.901,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-central-ac-only-2-speed.xml,33.644,33.644,33.644,33.644,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.06,0.554,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,34.042,34.042,34.042,34.042,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.775,0.237,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-central-ac-only-var-speed-detailed-performance.xml,33.387,33.387,33.387,33.387,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.261,0.097,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 @@ -317,8 +315,7 @@ base-hvac-pthp.xml,41.903,41.903,41.903,41.903,0.0,0.0,0.0,0.0,0.0,0.0,7.658,0.0 base-hvac-room-ac-only-33percent.xml,31.802,31.802,31.802,31.802,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.772,0.0,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only-ceer.xml,35.147,35.147,35.147,35.147,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.118,0.0,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only-detailed-setpoints.xml,33.937,33.937,33.937,33.937,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.889,0.0,9.055,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.928,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-room-ac-only-research-features-detailed-setpoints.xml,33.444,33.444,33.444,33.444,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.396,0.0,9.055,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.927,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-room-ac-only-research-features.xml,34.522,34.522,34.522,34.522,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,4.493,0.0,9.062,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.902,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 +base-hvac-room-ac-only-research-features.xml,33.444,33.444,33.444,33.444,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,3.396,0.0,9.055,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.927,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-only.xml,35.137,35.137,35.137,35.137,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,5.108,0.0,9.061,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,1.903,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-with-heating.xml,52.679,52.679,52.679,52.679,0.0,0.0,0.0,0.0,0.0,0.0,17.271,0.0,0.0,0.0,5.256,0.0,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 base-hvac-room-ac-with-reverse-cycle.xml,41.903,41.903,41.903,41.903,0.0,0.0,0.0,0.0,0.0,0.0,7.658,0.0,0.053,0.0,4.041,0.0,9.014,0.0,0.0,4.507,0.0,0.334,0.0,0.0,0.0,0.0,2.072,0.0,0.0,0.319,0.365,1.513,1.529,0.0,2.116,8.384,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 diff --git a/workflow/tests/base_results/results_simulations_hvac.csv b/workflow/tests/base_results/results_simulations_hvac.csv index c079f06d7..39bd239db 100644 --- a/workflow/tests/base_results/results_simulations_hvac.csv +++ b/workflow/tests/base_results/results_simulations_hvac.csv @@ -189,7 +189,6 @@ base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,6.8,91.76,43583.0,529 base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,6.8,91.76,0.0,36000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,6.8,91.76,36000.0,0.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 -base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml,-13.72,81.14,36000.0,36000.0,34121.4,42425.0,9778.0,9946.0,0.0,761.0,9165.0,0.0,0.0,2302.0,2876.0,7597.0,0.0,0.0,18226.0,6403.0,5891.0,0.0,156.0,143.0,0.0,0.0,0.0,2100.0,212.0,0.0,3320.0,0.0,0.0,1372.0,247.0,325.0,0.0,800.0 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,-13.72,81.14,36000.0,36000.0,34121.4,42425.0,9778.0,9946.0,0.0,761.0,9165.0,0.0,0.0,2302.0,2876.0,7597.0,0.0,0.0,18226.0,6403.0,5891.0,0.0,156.0,143.0,0.0,0.0,0.0,2100.0,212.0,0.0,3320.0,0.0,0.0,1372.0,247.0,325.0,0.0,800.0 base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 @@ -210,7 +209,7 @@ base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml,6.8,91.76,72000.0,72000.0,72000.0,37690.0,14159.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,32588.0,18661.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 -base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,-13.72,81.14,36000.0,36000.0,34121.4,42425.0,9778.0,9946.0,0.0,761.0,9165.0,0.0,0.0,2302.0,2876.0,7597.0,0.0,0.0,18226.0,6403.0,5891.0,0.0,156.0,143.0,0.0,0.0,0.0,2100.0,212.0,0.0,3320.0,0.0,0.0,1372.0,247.0,325.0,0.0,800.0 +base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-air-to-air-heat-pump-var-speed.xml,6.8,91.76,36000.0,36000.0,36000.0,31131.0,7600.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-autosize-sizing-controls.xml,0.0,100.0,31446.0,31720.0,0.0,31446.0,9165.0,7128.0,0.0,545.0,6568.0,0.0,0.0,1650.0,2061.0,4328.0,0.0,0.0,24522.0,6756.0,7422.0,0.0,318.0,1382.0,0.0,0.0,0.0,2714.0,780.0,0.0,5150.0,0.0,0.0,2348.0,425.0,724.0,0.0,1200.0 base-hvac-autosize.xml,6.8,91.76,32239.0,24867.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 @@ -225,7 +224,6 @@ base-hvac-boiler-wood-only.xml,6.8,91.76,36000.0,0.0,0.0,23530.0,0.0,7508.0,0.0, base-hvac-central-ac-only-1-speed-autosize-factor.xml,6.8,91.76,0.0,37000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-central-ac-only-1-speed-seer2.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-central-ac-only-1-speed.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 -base-hvac-central-ac-only-2-speed-research-features.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-central-ac-only-2-speed.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,6.8,91.76,0.0,24342.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-central-ac-only-var-speed-detailed-performance.xml,6.8,91.76,0.0,36000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 @@ -317,7 +315,6 @@ base-hvac-pthp.xml,6.8,91.76,36000.0,36000.0,36000.0,23530.0,0.0,7508.0,0.0,575. base-hvac-room-ac-only-33percent.xml,6.8,91.76,0.0,8000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-room-ac-only-ceer.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-room-ac-only-detailed-setpoints.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 -base-hvac-room-ac-only-research-features-detailed-setpoints.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-room-ac-only-research-features.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-room-ac-only.xml,6.8,91.76,0.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 base-hvac-room-ac-with-heating.xml,6.8,91.76,36000.0,24000.0,0.0,23530.0,0.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,13927.0,0.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0 diff --git a/workflow/tests/base_results/results_simulations_loads.csv b/workflow/tests/base_results/results_simulations_loads.csv index 9d1fef6f6..e716d1399 100644 --- a/workflow/tests/base_results/results_simulations_loads.csv +++ b/workflow/tests/base_results/results_simulations_loads.csv @@ -189,9 +189,8 @@ base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,21.525,0.108,11.994,9 base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,0.0,0.0,12.26,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.108,-0.151,-0.009,2.77,0.045,-0.539,10.592,0.0,0.0,0.0,-6.351,-0.119,-0.817,-3.754,-0.11,0.0,1.945,6.958,1.811 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,23.03,0.324,12.652,9.071,0.615,0.0,0.0,0.0,3.795,3.883,0.545,7.571,0.683,10.761,-13.574,0.0,0.0,0.0,8.365,-0.116,5.392,0.0,0.77,0.0,5.735,-8.475,-2.662,0.0,0.066,-0.188,-0.014,2.826,0.035,-0.633,10.839,0.0,0.0,0.0,-6.139,-0.112,-0.855,-3.881,-0.117,0.0,1.998,7.106,1.845 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,22.912,0.33,0.0,9.071,0.592,0.0,0.0,0.0,3.762,3.855,0.542,7.547,0.677,10.679,-13.459,0.0,0.0,0.0,8.213,-0.109,5.387,0.0,0.765,0.0,5.733,-8.398,-2.641,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0 -base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml,71.106,0.86,1.43,11.33,0.634,0.0,0.0,0.0,6.318,6.969,0.98,15.297,1.466,19.287,-14.655,0.0,0.0,0.0,17.64,0.376,13.275,0.0,1.68,0.0,15.082,-10.558,-3.277,0.0,-0.296,-0.557,-0.077,0.314,-0.143,-1.961,6.974,0.0,0.0,0.0,-6.937,0.357,-1.196,-1.721,-0.199,0.0,0.102,4.979,1.231 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,24.245,2.017,12.204,9.071,0.614,0.0,0.0,0.0,3.902,3.967,0.554,7.966,0.669,10.638,-14.043,0.0,0.0,0.0,9.507,0.146,5.407,0.0,0.817,0.0,5.17,-8.515,-2.713,0.0,0.124,-0.142,-0.01,2.964,0.013,-0.857,10.371,0.0,0.0,0.0,-5.93,0.136,-0.892,-4.396,-0.103,0.0,1.942,7.069,1.794 -base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,71.176,0.69,1.5,11.33,0.633,0.0,0.0,0.0,6.189,6.896,0.975,14.882,1.504,19.738,-13.887,0.0,0.0,0.0,16.342,-0.089,13.521,0.0,1.608,0.0,16.353,-10.462,-3.2,0.0,-0.363,-0.628,-0.081,0.111,-0.107,-1.532,7.742,0.0,0.0,0.0,-7.335,-0.091,-1.098,-1.638,-0.222,0.0,0.171,5.077,1.307 +base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,71.106,0.86,1.43,11.33,0.634,0.0,0.0,0.0,6.318,6.969,0.98,15.297,1.466,19.287,-14.655,0.0,0.0,0.0,17.64,0.376,13.275,0.0,1.68,0.0,15.082,-10.558,-3.277,0.0,-0.296,-0.557,-0.077,0.314,-0.143,-1.961,6.974,0.0,0.0,0.0,-6.937,0.357,-1.196,-1.721,-0.199,0.0,0.102,4.979,1.231 base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml,23.03,0.324,12.652,9.071,0.615,0.0,0.0,0.0,3.795,3.883,0.545,7.571,0.683,10.761,-13.574,0.0,0.0,0.0,8.365,-0.116,5.392,0.0,0.77,0.0,5.735,-8.475,-2.662,0.0,0.066,-0.188,-0.014,2.826,0.035,-0.633,10.839,0.0,0.0,0.0,-6.139,-0.112,-0.855,-3.881,-0.117,0.0,1.998,7.106,1.845 base-hvac-air-to-air-heat-pump-1-speed.xml,23.03,0.324,12.652,9.071,0.615,0.0,0.0,0.0,3.795,3.883,0.545,7.571,0.683,10.761,-13.574,0.0,0.0,0.0,8.365,-0.116,5.392,0.0,0.77,0.0,5.735,-8.475,-2.662,0.0,0.066,-0.188,-0.014,2.826,0.035,-0.633,10.839,0.0,0.0,0.0,-6.139,-0.112,-0.855,-3.881,-0.117,0.0,1.998,7.106,1.845 base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,72.146,0.527,1.529,11.33,0.633,0.0,0.0,0.0,6.129,6.878,0.972,14.837,1.499,19.673,-13.849,0.0,0.0,0.0,16.29,-0.07,13.46,0.0,1.601,0.0,17.415,-10.444,-3.194,0.0,-0.373,-0.642,-0.084,0.083,-0.11,-1.583,7.78,0.0,0.0,0.0,-7.36,-0.07,-1.141,-1.641,-0.228,0.0,0.154,5.095,1.313 @@ -210,7 +209,7 @@ base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,26.709,0.094,14.214,9.071,0.615,0.0,0.0,0.0,3.615,3.884,0.546,7.576,0.683,10.766,-13.574,0.0,0.0,0.0,8.375,-0.116,5.463,0.0,0.77,0.0,9.501,-8.475,-2.662,0.0,0.02,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.137,-0.112,-0.854,-3.886,-0.117,0.0,3.607,7.106,1.845 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml,25.757,0.388,14.285,9.071,0.615,0.0,0.0,0.0,3.696,3.912,0.55,7.6,0.696,10.866,-13.521,0.0,0.0,0.0,8.321,-0.108,5.358,0.0,0.778,0.0,8.442,-8.492,-2.669,0.0,0.057,-0.2,-0.017,2.828,0.032,-0.621,10.832,0.0,0.0,0.0,-6.156,-0.103,-0.82,-3.714,-0.119,0.0,3.485,7.089,1.838 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml,26.02,0.036,13.9,9.071,0.615,0.0,0.0,0.0,3.659,3.884,0.546,7.577,0.683,10.766,-13.574,0.0,0.0,0.0,8.376,-0.116,5.351,0.0,0.77,0.0,8.888,-8.475,-2.662,0.0,0.031,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.137,-0.112,-0.855,-3.884,-0.116,0.0,3.287,7.106,1.845 -base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,73.642,0.383,1.897,11.33,0.635,0.0,0.0,0.0,6.031,6.888,0.975,14.803,1.501,19.723,-13.921,0.0,0.0,0.0,16.024,-0.119,13.477,0.0,1.612,0.0,19.802,-10.48,-3.209,0.0,-0.344,-0.593,-0.076,0.211,-0.099,-1.413,7.708,0.0,0.0,0.0,-7.247,-0.117,-1.011,-1.6,-0.211,0.0,0.425,5.055,1.298 +base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,25.283,0.252,13.882,9.071,0.615,0.0,0.0,0.0,3.671,3.876,0.544,7.553,0.681,10.741,-13.574,0.0,0.0,0.0,8.339,-0.116,5.353,0.0,0.768,0.0,8.245,-8.475,-2.662,0.0,0.031,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.14,-0.112,-0.855,-3.884,-0.117,0.0,3.266,7.106,1.845 base-hvac-air-to-air-heat-pump-var-speed.xml,25.372,0.315,13.884,9.071,0.615,0.0,0.0,0.0,3.683,3.884,0.546,7.574,0.683,10.764,-13.574,0.0,0.0,0.0,8.372,-0.116,5.358,0.0,0.77,0.0,8.21,-8.475,-2.662,0.0,0.031,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.138,-0.112,-0.855,-3.885,-0.117,0.0,3.266,7.106,1.845 base-hvac-autosize-sizing-controls.xml,7.144,0.0,8.365,16.265,0.648,0.0,0.0,0.0,3.006,2.853,0.398,5.383,0.429,7.638,-13.035,0.0,0.0,0.0,5.837,-0.036,3.607,0.0,0.583,0.0,1.608,-8.91,-2.543,0.0,-0.194,-0.457,-0.051,2.506,-0.028,-1.436,11.378,0.0,0.0,0.0,-7.041,-0.037,-1.114,-6.843,-0.166,0.0,1.534,8.471,1.965 base-hvac-autosize.xml,22.692,0.0,13.626,9.071,0.615,0.0,0.0,0.0,3.81,3.883,0.545,7.571,0.682,10.761,-13.574,0.0,0.0,0.0,8.364,-0.116,5.254,0.0,0.77,0.0,5.526,-8.475,-2.662,0.0,0.034,-0.188,-0.014,2.827,0.035,-0.632,10.839,0.0,0.0,0.0,-6.138,-0.112,-0.848,-3.884,-0.117,0.0,2.991,7.106,1.845 @@ -225,7 +224,6 @@ base-hvac-boiler-wood-only.xml,17.11,0.0,0.0,9.071,0.592,0.0,0.0,0.0,4.074,3.852 base-hvac-central-ac-only-1-speed-autosize-factor.xml,0.0,0.0,12.253,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.108,-0.151,-0.009,2.77,0.045,-0.54,10.592,0.0,0.0,0.0,-6.351,-0.119,-0.818,-3.754,-0.11,0.0,1.938,6.958,1.811 base-hvac-central-ac-only-1-speed-seer2.xml,0.0,0.0,13.399,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.069,-0.15,-0.009,2.771,0.045,-0.539,10.592,0.0,0.0,0.0,-6.35,-0.119,-0.809,-3.758,-0.11,0.0,3.105,6.958,1.811 base-hvac-central-ac-only-1-speed.xml,0.0,0.0,13.399,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.069,-0.15,-0.009,2.771,0.045,-0.539,10.592,0.0,0.0,0.0,-6.35,-0.119,-0.809,-3.758,-0.11,0.0,3.105,6.958,1.811 -base-hvac-central-ac-only-2-speed-research-features.xml,0.0,0.0,14.21,9.071,0.667,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.081,-0.166,-0.012,2.75,0.043,-0.519,10.597,0.0,0.0,0.0,-6.423,-0.115,-0.756,-3.614,-0.114,0.0,3.846,6.935,1.803 base-hvac-central-ac-only-2-speed.xml,0.0,0.0,13.763,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.056,-0.15,-0.009,2.771,0.045,-0.538,10.592,0.0,0.0,0.0,-6.349,-0.119,-0.806,-3.758,-0.11,0.0,3.475,6.958,1.811 base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,0.0,0.0,14.866,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.017,-0.15,-0.009,2.771,0.045,-0.538,10.592,0.0,0.0,0.0,-6.349,-0.119,-0.809,-3.766,-0.11,0.0,4.631,6.958,1.811 base-hvac-central-ac-only-var-speed-detailed-performance.xml,0.0,0.0,13.906,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.058,-0.15,-0.009,2.771,0.045,-0.539,10.592,0.0,0.0,0.0,-6.35,-0.119,-0.817,-3.76,-0.11,0.0,3.642,6.958,1.811 @@ -317,8 +315,7 @@ base-hvac-pthp.xml,17.258,0.053,10.74,9.071,0.615,0.0,0.0,0.0,4.108,3.88,0.545,7 base-hvac-room-ac-only-33percent.xml,0.0,0.0,3.431,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.072,-0.05,-0.003,0.913,0.015,-0.179,3.495,0.0,0.0,0.0,-2.097,-0.039,-0.273,-1.239,-0.036,0.0,0.0,2.296,0.598 base-hvac-room-ac-only-ceer.xml,0.0,0.0,10.398,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.219,-0.152,-0.009,2.767,0.045,-0.542,10.592,0.0,0.0,0.0,-6.355,-0.119,-0.828,-3.753,-0.11,0.0,0.0,6.958,1.811 base-hvac-room-ac-only-detailed-setpoints.xml,0.0,0.0,7.669,9.071,0.659,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.117,-0.263,-0.026,2.301,0.015,-0.872,10.229,0.0,0.0,0.0,-6.825,-0.141,-0.882,-4.185,-0.128,0.0,0.0,6.714,1.742 -base-hvac-room-ac-only-research-features-detailed-setpoints.xml,0.0,0.0,7.619,9.071,0.659,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.171,-0.291,-0.031,2.247,0.009,-0.905,10.24,0.0,0.0,0.0,-6.955,-0.13,-0.87,-4.062,-0.135,0.0,0.0,6.716,1.743 -base-hvac-room-ac-only-research-features.xml,0.0,0.0,10.314,9.071,0.667,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.268,-0.176,-0.014,2.721,0.04,-0.551,10.6,0.0,0.0,0.0,-6.468,-0.115,-0.808,-3.678,-0.116,0.0,0.0,6.937,1.803 +base-hvac-room-ac-only-research-features.xml,0.0,0.0,7.619,9.071,0.659,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.171,-0.291,-0.031,2.247,0.009,-0.905,10.24,0.0,0.0,0.0,-6.955,-0.13,-0.87,-4.062,-0.135,0.0,0.0,6.716,1.743 base-hvac-room-ac-only.xml,0.0,0.0,10.398,9.071,0.666,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.219,-0.152,-0.009,2.767,0.045,-0.542,10.592,0.0,0.0,0.0,-6.355,-0.119,-0.828,-3.753,-0.11,0.0,0.0,6.958,1.811 base-hvac-room-ac-with-heating.xml,17.257,0.0,10.74,9.071,0.615,0.0,0.0,0.0,4.108,3.88,0.545,7.563,0.682,10.754,-13.574,0.0,0.0,0.0,8.349,-0.116,5.08,0.0,0.77,0.0,0.0,-8.475,-2.662,0.0,0.18,-0.189,-0.014,2.824,0.035,-0.635,10.839,0.0,0.0,0.0,-6.144,-0.112,-0.865,-3.879,-0.116,0.0,0.0,7.106,1.845 base-hvac-room-ac-with-reverse-cycle.xml,17.258,0.053,10.74,9.071,0.615,0.0,0.0,0.0,4.108,3.88,0.545,7.563,0.682,10.754,-13.574,0.0,0.0,0.0,8.349,-0.116,5.08,0.0,0.77,0.0,0.0,-8.475,-2.662,0.0,0.18,-0.189,-0.014,2.824,0.035,-0.635,10.839,0.0,0.0,0.0,-6.144,-0.112,-0.865,-3.879,-0.116,0.0,0.0,7.106,1.845 diff --git a/workflow/tests/base_results/results_simulations_misc.csv b/workflow/tests/base_results/results_simulations_misc.csv index c9e8590a9..d597ee8b8 100644 --- a/workflow/tests/base_results/results_simulations_misc.csv +++ b/workflow/tests/base_results/results_simulations_misc.csv @@ -189,9 +189,8 @@ base-hvac-air-to-air-heat-pump-1-speed-autosize-factor.xml,0.0,0.0,1354.7,998.0, base-hvac-air-to-air-heat-pump-1-speed-cooling-only.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1924.5,3314.8,3314.8,0.0,15.909,0.0 base-hvac-air-to-air-heat-pump-1-speed-heating-capacity-17f.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,7092.4,3686.8,7092.4,24.683,16.2,0.0 base-hvac-air-to-air-heat-pump-1-speed-heating-only.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,7155.7,1806.9,7155.7,24.961,0.0,0.0 -base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features.xml,128.667,0.0,1354.7,998.0,11924.7,2736.4,20130.4,9707.8,20130.4,61.55,33.665,0.0 base-hvac-air-to-air-heat-pump-1-speed-lockout-temperatures.xml,143.0,0.0,1354.7,998.0,11171.5,2563.5,14718.6,3332.2,14718.6,51.303,16.054,0.0 -base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,0.0,0.0,1354.7,998.0,11924.7,2736.4,19838.3,9655.7,19838.3,56.055,35.286,0.0 +base-hvac-air-to-air-heat-pump-1-speed-research-features.xml,128.667,0.0,1354.7,998.0,11924.7,2736.4,20130.4,9707.8,20130.4,61.55,33.665,0.0 base-hvac-air-to-air-heat-pump-1-speed-seer2-hspf2.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,7092.4,3680.9,7092.4,24.683,16.2,0.0 base-hvac-air-to-air-heat-pump-1-speed.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,7092.4,3686.8,7092.4,24.683,16.2,0.0 base-hvac-air-to-air-heat-pump-2-speed-research-features.xml,0.0,0.0,1354.7,998.0,11924.7,2736.4,19281.2,8135.7,19281.2,56.584,28.32,0.0 @@ -210,7 +209,7 @@ base-hvac-air-to-air-heat-pump-var-speed-detailed-performance-other-temperatures base-hvac-air-to-air-heat-pump-var-speed-detailed-performance.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,5193.0,3838.4,5193.0,24.671,18.025,0.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-10-mins.xml,164.167,0.0,1354.7,998.0,11171.7,2563.6,15873.3,4519.8,15873.3,61.922,18.014,0.0 base-hvac-air-to-air-heat-pump-var-speed-max-power-ratio-schedule-two-systems.xml,29.0,0.0,1354.7,998.0,11171.6,2563.5,5368.2,3149.4,5368.2,26.988,19.449,0.0 -base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,888.417,0.0,1354.7,998.0,11924.7,2736.4,19421.6,7031.9,19421.6,59.533,12.943,0.0 +base-hvac-air-to-air-heat-pump-var-speed-research-features.xml,158.0,0.0,1354.7,998.0,11171.6,2563.5,7758.5,2802.4,7758.5,27.266,18.049,0.0 base-hvac-air-to-air-heat-pump-var-speed.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,5876.1,3140.0,5876.1,24.733,18.05,0.0 base-hvac-autosize-sizing-controls.xml,0.0,0.0,1910.5,1245.6,22082.2,3602.7,2465.6,3560.8,3560.8,17.378,14.875,0.0 base-hvac-autosize.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,2062.2,3796.6,3796.6,23.99,18.454,0.0 @@ -225,7 +224,6 @@ base-hvac-boiler-wood-only.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,1954.5,1806.9 base-hvac-central-ac-only-1-speed-autosize-factor.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3328.4,3328.4,0.0,15.876,0.0 base-hvac-central-ac-only-1-speed-seer2.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3584.2,3584.2,0.0,18.55,0.0 base-hvac-central-ac-only-1-speed.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3590.8,3590.8,0.0,18.55,0.0 -base-hvac-central-ac-only-2-speed-research-features.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,6805.7,8523.3,8523.3,0.0,21.47,0.0 base-hvac-central-ac-only-2-speed.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3109.2,3109.2,0.0,19.007,0.0 base-hvac-central-ac-only-var-speed-detailed-performance-autosize.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3985.5,3985.5,0.0,18.779,0.0 base-hvac-central-ac-only-var-speed-detailed-performance.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1974.5,3495.4,3495.4,0.0,17.773,0.0 @@ -317,8 +315,7 @@ base-hvac-pthp.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,4859.0,3364.3,4859.0,16.7 base-hvac-room-ac-only-33percent.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1924.5,2313.1,2313.1,0.0,3.903,0.0 base-hvac-room-ac-only-ceer.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1924.5,3455.4,3455.4,0.0,11.827,0.0 base-hvac-room-ac-only-detailed-setpoints.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,1924.3,3605.6,3605.6,0.0,10.661,0.0 -base-hvac-room-ac-only-research-features-detailed-setpoints.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,6761.4,9475.8,9475.8,0.0,23.894,0.0 -base-hvac-room-ac-only-research-features.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,6757.1,9616.0,9616.0,0.0,23.71,0.0 +base-hvac-room-ac-only-research-features.xml,0.0,0.0,1354.7,998.0,11171.8,2563.6,6761.4,9475.8,9475.8,0.0,23.894,0.0 base-hvac-room-ac-only.xml,0.0,0.0,1354.7,998.0,11171.5,2563.5,1924.5,3451.5,3451.5,0.0,11.827,0.0 base-hvac-room-ac-with-heating.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,5887.1,3815.0,5887.1,16.748,12.045,0.0 base-hvac-room-ac-with-reverse-cycle.xml,0.0,0.0,1354.7,998.0,11171.6,2563.5,4859.0,3364.3,4859.0,16.748,12.045,0.0 diff --git a/workflow/tests/base_results/results_sizing.csv b/workflow/tests/base_results/results_sizing.csv index e1acb55e8..9a3c787bd 100644 --- a/workflow/tests/base_results/results_sizing.csv +++ b/workflow/tests/base_results/results_sizing.csv @@ -14,12 +14,6 @@ denver-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodolog denver-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-HERS-backup-supplemental.xml,31131.0,0.0,16419.0,970.0,0.0 denver-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-MaxLoad-backup-emergency.xml,65875.0,0.0,31131.0,2053.0,0.0 denver-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-MaxLoad-backup-supplemental.xml,65875.0,0.0,0.0,2053.0,0.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-ACCA-backup-emergency.xml,24867.0,24867.0,31131.0,775.0,829.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-ACCA-backup-supplemental.xml,24867.0,24867.0,19379.0,775.0,829.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-HERS-backup-emergency.xml,31131.0,31131.0,31131.0,970.0,1038.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-HERS-backup-supplemental.xml,31131.0,31131.0,19379.0,970.0,1038.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-MaxLoad-backup-emergency.xml,65875.0,65875.0,31131.0,2053.0,2196.0 -denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-MaxLoad-backup-supplemental.xml,65875.0,65875.0,0.0,2053.0,2196.0 denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-ACCA-backup-emergency.xml,24867.0,24867.0,31131.0,775.0,829.0 denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-ACCA-backup-supplemental.xml,24867.0,24867.0,19379.0,775.0,829.0 denver-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-HERS-backup-emergency.xml,31131.0,31131.0,31131.0,970.0,1038.0 @@ -120,7 +114,6 @@ denver-hvac-autosize-boiler-propane-only.xml,23530.0,0.0,0.0,0.0,0.0 denver-hvac-autosize-boiler-wood-only.xml,23530.0,0.0,0.0,0.0,0.0 denver-hvac-autosize-central-ac-only-1-speed-seer2.xml,0.0,24867.0,0.0,0.0,829.0 denver-hvac-autosize-central-ac-only-1-speed.xml,0.0,24867.0,0.0,0.0,829.0 -denver-hvac-autosize-central-ac-only-2-speed-research-features.xml,0.0,26011.0,0.0,0.0,867.0 denver-hvac-autosize-central-ac-only-2-speed.xml,0.0,26011.0,0.0,0.0,867.0 denver-hvac-autosize-central-ac-only-var-speed-max-power-ratio-schedule.xml,0.0,23678.0,0.0,0.0,789.0 denver-hvac-autosize-central-ac-only-var-speed.xml,0.0,23678.0,0.0,0.0,789.0 @@ -346,7 +339,6 @@ denver-hvac-autosize-pthp-sizing-methodology-MaxLoad-backup-supplemental.xml,497 denver-hvac-autosize-room-ac-only-33percent.xml,0.0,4974.0,0.0,0.0,129.0 denver-hvac-autosize-room-ac-only-ceer.xml,0.0,15074.0,0.0,0.0,392.0 denver-hvac-autosize-room-ac-only-detailed-setpoints.xml,0.0,15074.0,0.0,0.0,392.0 -denver-hvac-autosize-room-ac-only-research-features-detailed-setpoints.xml,0.0,15074.0,0.0,0.0,392.0 denver-hvac-autosize-room-ac-only-research-features.xml,0.0,15074.0,0.0,0.0,392.0 denver-hvac-autosize-room-ac-only.xml,0.0,15074.0,0.0,0.0,392.0 denver-hvac-autosize-room-ac-with-heating.xml,23530.0,15074.0,0.0,513.0,392.0 @@ -380,12 +372,6 @@ houston-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodolo houston-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-HERS-backup-supplemental.xml,19975.0,0.0,3398.0,520.0,0.0 houston-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-MaxLoad-backup-emergency.xml,24069.0,0.0,19975.0,627.0,0.0 houston-hvac-autosize-air-to-air-heat-pump-1-speed-heating-only-sizing-methodology-MaxLoad-backup-supplemental.xml,24069.0,0.0,0.0,627.0,0.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-ACCA-backup-emergency.xml,29879.0,29879.0,19975.0,778.0,996.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-ACCA-backup-supplemental.xml,29879.0,29879.0,0.0,778.0,996.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-HERS-backup-emergency.xml,29879.0,29879.0,19975.0,778.0,996.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-HERS-backup-supplemental.xml,29879.0,29879.0,0.0,778.0,996.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-MaxLoad-backup-emergency.xml,30956.0,30956.0,19975.0,806.0,1032.0 -houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-research-features-sizing-methodology-MaxLoad-backup-supplemental.xml,30956.0,30956.0,0.0,806.0,1032.0 houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-ACCA-backup-emergency.xml,29879.0,29879.0,19975.0,778.0,996.0 houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-ACCA-backup-supplemental.xml,29879.0,29879.0,0.0,778.0,996.0 houston-hvac-autosize-air-to-air-heat-pump-1-speed-lockout-temperatures-sizing-methodology-HERS-backup-emergency.xml,29879.0,29879.0,19975.0,778.0,996.0 @@ -486,7 +472,6 @@ houston-hvac-autosize-boiler-propane-only.xml,13974.0,0.0,0.0,0.0,0.0 houston-hvac-autosize-boiler-wood-only.xml,13974.0,0.0,0.0,0.0,0.0 houston-hvac-autosize-central-ac-only-1-speed-seer2.xml,0.0,29879.0,0.0,0.0,996.0 houston-hvac-autosize-central-ac-only-1-speed.xml,0.0,29879.0,0.0,0.0,996.0 -houston-hvac-autosize-central-ac-only-2-speed-research-features.xml,0.0,29486.0,0.0,0.0,983.0 houston-hvac-autosize-central-ac-only-2-speed.xml,0.0,29486.0,0.0,0.0,983.0 houston-hvac-autosize-central-ac-only-var-speed-max-power-ratio-schedule.xml,0.0,27249.0,0.0,0.0,908.0 houston-hvac-autosize-central-ac-only-var-speed.xml,0.0,27249.0,0.0,0.0,908.0 @@ -712,7 +697,6 @@ houston-hvac-autosize-pthp-sizing-methodology-MaxLoad-backup-supplemental.xml,20 houston-hvac-autosize-room-ac-only-33percent.xml,0.0,6083.0,0.0,0.0,158.0 houston-hvac-autosize-room-ac-only-ceer.xml,0.0,18433.0,0.0,0.0,479.0 houston-hvac-autosize-room-ac-only-detailed-setpoints.xml,0.0,18433.0,0.0,0.0,479.0 -houston-hvac-autosize-room-ac-only-research-features-detailed-setpoints.xml,0.0,18433.0,0.0,0.0,479.0 houston-hvac-autosize-room-ac-only-research-features.xml,0.0,18433.0,0.0,0.0,479.0 houston-hvac-autosize-room-ac-only.xml,0.0,18433.0,0.0,0.0,479.0 houston-hvac-autosize-room-ac-with-heating.xml,13974.0,18433.0,0.0,255.0,479.0 From 0ec6e087d3a85a1661a34ca50cf0e026d17de657 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Fri, 6 Sep 2024 11:34:52 -0600 Subject: [PATCH 3/5] Bugfix, rubocop. [ci skip] --- rulesets/resources/301ruleset.rb | 8 ++++---- rulesets/resources/ES_ZERHruleset.rb | 8 ++++---- rulesets/resources/util.rb | 13 +++++++------ rulesets/tests/util.rb | 1 - 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb index b9641728d..819f190cb 100644 --- a/rulesets/resources/301ruleset.rb +++ b/rulesets/resources/301ruleset.rb @@ -338,13 +338,13 @@ def self.set_summary_iad(orig_bldg, new_bldg) def self.set_climate(orig_bldg, new_bldg) # Always use 2006 IECC climate zone for ERI calculation - climate_zone_iecc = get_climate_zone_of_year(orig_bldg, 2006) - new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: climate_zone_iecc.year, - zone: climate_zone_iecc.zone) + iecc_climate_zone, year = get_climate_zone_of_year(orig_bldg, 2006) + new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: year, + zone: iecc_climate_zone) new_bldg.climate_and_risk_zones.weather_station_id = orig_bldg.climate_and_risk_zones.weather_station_id new_bldg.climate_and_risk_zones.weather_station_name = orig_bldg.climate_and_risk_zones.weather_station_name new_bldg.climate_and_risk_zones.weather_station_epw_filepath = orig_bldg.climate_and_risk_zones.weather_station_epw_filepath - @iecc_zone = climate_zone_iecc.zone + @iecc_zone = iecc_climate_zone end def self.set_enclosure_air_infiltration_reference(orig_bldg, new_bldg) diff --git a/rulesets/resources/ES_ZERHruleset.rb b/rulesets/resources/ES_ZERHruleset.rb index 4ad596994..16d2aa109 100644 --- a/rulesets/resources/ES_ZERHruleset.rb +++ b/rulesets/resources/ES_ZERHruleset.rb @@ -22,7 +22,7 @@ def self.apply_ruleset(hpxml, calc_type, lookup_program_data) # Use Year=2006 for Reference Home configuration iecc_climate_zone_year = 2006 end - @iecc_zone = get_climate_zone_of_year(hpxml.buildings[0], iecc_climate_zone_year) + @iecc_zone, _year = get_climate_zone_of_year(hpxml.buildings[0], iecc_climate_zone_year) @lookup_program_data = lookup_program_data # Update HPXML object based on ESRD configuration @@ -154,9 +154,9 @@ def self.set_summary_reference(orig_bldg, new_bldg) def self.set_climate(orig_bldg, new_bldg) # Set 2006 IECC zone for downstream ERI calculation - climate_zone_iecc = get_climate_zone_of_year(orig_bldg, 2006) - new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: climate_zone_iecc.year, - zone: climate_zone_iecc.zone) + iecc_climate_zone, year = get_climate_zone_of_year(orig_bldg, 2006) + new_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: year, + zone: iecc_climate_zone) new_bldg.climate_and_risk_zones.weather_station_id = orig_bldg.climate_and_risk_zones.weather_station_id new_bldg.climate_and_risk_zones.weather_station_name = orig_bldg.climate_and_risk_zones.weather_station_name new_bldg.climate_and_risk_zones.weather_station_wmo = orig_bldg.climate_and_risk_zones.weather_station_wmo diff --git a/rulesets/resources/util.rb b/rulesets/resources/util.rb index eeea2d486..db65f0d5b 100644 --- a/rulesets/resources/util.rb +++ b/rulesets/resources/util.rb @@ -1,14 +1,15 @@ +# frozen_string_literal: true + def get_climate_zone_of_year(hpxml_bldg, iecc_year) - # Returns the climate zone of the given year; if not found - # uses an earlier year with the assumption that the climate zone - # has not changed. + # Returns the climate zone and year given a target year; if not found uses + # an earlier year with the assumption that the climate zone has not changed. year = iecc_year while year >= 2003 climate_zone_iecc = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.find { |z| z.year == year } if not climate_zone_iecc.nil? - return climate_zone_iecc + return climate_zone_iecc.zone, climate_zone_iecc.year end + year -= 3 end - return nil -end \ No newline at end of file +end diff --git a/rulesets/tests/util.rb b/rulesets/tests/util.rb index 03b917395..5e73e55e8 100644 --- a/rulesets/tests/util.rb +++ b/rulesets/tests/util.rb @@ -26,7 +26,6 @@ def _change_eri_version(hpxml_name, version) def _change_iecc_version(hpxml_name, version) # Create derivative file w/ changed ERI version hpxml = HPXML.new(hpxml_path: File.join(@root_path, 'workflow', 'sample_files', hpxml_name)) - hpxml_bldg = hpxml.buildings[0] hpxml.header.iecc_eri_calculation_version = version hpxml_name = File.basename(@tmp_hpxml_path) From 25a41dda41ea13bd3cb30c9d956c7950fb88d638 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Fri, 6 Sep 2024 15:13:58 -0600 Subject: [PATCH 4/5] Update test. --- rulesets/tests/test_validation.rb | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/rulesets/tests/test_validation.rb b/rulesets/tests/test_validation.rb index 75e42fe0b..be32f0025 100644 --- a/rulesets/tests/test_validation.rb +++ b/rulesets/tests/test_validation.rb @@ -74,19 +74,16 @@ def test_schema_schematron_error_messages 'Expected 1 element(s) for xpath: ../../../../Building/Site/Address/StateCode[text()="FL"]'], 'energy-star-SF_National_3.0' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]'], 'energy-star-SF_National_3.1' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]'], - 'energy-star-SF_National_3.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]', - 'Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone'], + 'energy-star-SF_National_3.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]'], 'energy-star-SF_OregonWashington_3.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]', 'Expected 1 element(s) for xpath: ../../../../Building/Site/Address/StateCode[text()="OR" or text()="WA"]'], 'energy-star-SF_Pacific_3.0' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family detached" or text()="single-family attached"]]', 'Expected 1 element(s) for xpath: ../../../../Building/Site/Address/StateCode[text()="HI" or text()="GU" or text()="MP"]'], 'energy-star-MF_National_1.0' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]]'], 'energy-star-MF_National_1.1' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]]'], - 'energy-star-MF_National_1.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]]', - 'Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2021"]/ClimateZone'], + 'energy-star-MF_National_1.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]]'], 'energy-star-MF_OregonWashington_1.2' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/BuildingSummary/BuildingConstruction[ResidentialFacilityType[text()="single-family attached" or text()="apartment unit"]]', - 'Expected 1 element(s) for xpath: ../../../../Building/Site/Address/StateCode[text()="OR" or text()="WA"]'], - 'zerh-version_1' => ['Expected 1 element(s) for xpath: ../../../../Building/BuildingDetails/ClimateandRiskZones/ClimateZoneIECC[Year="2015"]/ClimateZone'] } + 'Expected 1 element(s) for xpath: ../../../../Building/Site/Address/StateCode[text()="OR" or text()="WA"]'] } all_expected_errors.each_with_index do |(error_case, expected_errors), i| puts "[#{i + 1}/#{all_expected_errors.size}] Testing #{error_case}..." @@ -130,18 +127,6 @@ def test_schema_schematron_error_messages hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.clear hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, zone: zone) - elsif error_case.include? 'zerh' - versions = { 'zerh-version_1' => ZERHConstants::Ver1, - 'zerh-version_2' => ZERHConstants::SFVer2 } - version = versions[error_case] - hpxml, hpxml_bldg = _create_hpxml('base.xml') - hpxml.header.zerh_calculation_version = version - hpxml.header.iecc_eri_calculation_version = nil - hpxml.header.energystar_calculation_version = nil - zone = hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs[0].zone - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.clear - hpxml_bldg.climate_and_risk_zones.climate_zone_ieccs.add(year: 2006, - zone: zone) else fail "Unhandled case: #{error_case}." end From cfa61022f9965bed18608107dedceaa026b42c90 Mon Sep 17 00:00:00 2001 From: Scott Horowitz Date: Fri, 6 Sep 2024 17:21:02 -0600 Subject: [PATCH 5/5] Stepping back from the edge. --- Changelog.md | 3 +-- docs/source/workflow_inputs.rst | 20 +++++--------------- rulesets/resources/301validator.xml | 2 +- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/Changelog.md b/Changelog.md index e9fda35c9..dfc451fad 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,8 +6,7 @@ __New Features__ - **Breaking change**: Renamed `Emissions: : RESNET: XXX` to `Emissions: : ANSI301: XXX` in Annual Home CSV output files. - Adds inputs for modeling skylight curbs and/or shafts. - Relaxes IECC climate zone requirements. - - Providing only a single IECC climate zone (of any year) is now allowed. - - For programs that use specific IECC climate zone years (e.g., 2021 for ZERH SF 2.0), that year is used if provided in the HPXML, otherwise the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. + - IECC climate zone years other than 2006 are now always optional; for programs that use specific IECC climate zone years (e.g., 2021 for ZERH SF 2.0), that year is used if provided, otherwise the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. - See [the documentation](https://openstudio-eri.readthedocs.io/en/latest/workflow_inputs.html#hpxml-climate-zones) for more information. __Bugfixes__ diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst index c5195ade8..b2be166c7 100644 --- a/docs/source/workflow_inputs.rst +++ b/docs/source/workflow_inputs.rst @@ -177,22 +177,10 @@ One or more IECC climate zones are each entered as a ``/HPXML/Building/BuildingD ================================= ======== ===== =========== ======== ======== =============== .. [#] Year choices are 2003, 2006, 2009, 2012, 2015, 2018, 2021, or 2024. - .. [#] At least one IECC climate zone is required. - The following climate zone years will be used based on the programs selected for calculation. - If the year cannot be found, the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. + .. [#] The IECC climate zone for 2006 is always required. + IECC climate zone years other than 2006 are optional; for programs that use specific IECC climate zone years (e.g., 2021 for ZERH SF 2.0), that year is used if provided, otherwise the next earliest provided year will be used with the assumption that the climate zone has not changed across the years. + See below for the list of climate zone years used by different programs: - \- **ERI**: 2006 - - \- **CO2 Index**: 2006 - - \- **IECC ERI 2015**: 2015 - - \- **IECC ERI 2018**: 2018 - - \- **IECC ERI 2021**: 2021 - - \- **IECC ERI 2024**: 2024 - \- **ENERGY STAR SFNH National v3.2**: 2021 \- **ENERGY STAR MFNC National v1.2**: 2021 @@ -201,6 +189,8 @@ One or more IECC climate zones are each entered as a ``/HPXML/Building/BuildingD \- **ZERH SF/MF 2.0**: 2021 + \- **IECC ERI 20XX**: 20XX + .. [#] ClimateZone choices are "1A", "1B", "1C", "2A", "2B", "2C", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "6C", "7", or "8". HPXML Enclosure diff --git a/rulesets/resources/301validator.xml b/rulesets/resources/301validator.xml index aa3765e9a..2480cb39d 100644 --- a/rulesets/resources/301validator.xml +++ b/rulesets/resources/301validator.xml @@ -129,7 +129,7 @@ Expected 1 element(s) for xpath: BuildingSummary/Site Expected 1 element(s) for xpath: BuildingSummary/BuildingConstruction - Expected 1 or more element(s) for xpath: ClimateandRiskZones/ClimateZoneIECC[Year]/ClimateZone + Expected 1 element(s) for xpath: ClimateandRiskZones/ClimateZoneIECC[Year="2006"]/ClimateZone Expected 1 element(s) for xpath: ClimateandRiskZones/WeatherStation Expected 1 element(s) for xpath: Enclosure/AirInfiltration/AirInfiltrationMeasurement[BuildingAirLeakage/AirLeakage | EffectiveLeakageArea] Expected 0 or more element(s) for xpath: Enclosure/Attics/Attic