Skip to content

Update NEEP ASHP sample files, take 2 #1935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
shorowit merged 3 commits into from
Feb 20, 2025
Merged

Update NEEP ASHP sample files, take 2 #1935

shorowit merged 3 commits into from
Feb 20, 2025

Conversation

@shorowit
Copy link
Contributor

@shorowit shorowit commented Feb 20, 2025 •
edited
Loading

Pull Request Description

A couple of the NEEP products we had previously chosen for our sample files do not pass the approved data quality checks, so switching to different products. Follow-up to #1925.

Checklist

Not all may apply:

  • Schematron validator (EPvalidator.xml) has been updated
  • Sample files have been added/updated (openstudio tasks.rb update_hpxmls)
  • Tests have been added/updated (e.g., HPXMLtoOpenStudio/tests/test*.rb and/or workflow/tests/test*.rb)
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected changes to simulation results of sample files

@shorowit shorowit self-assigned this Feb 20, 2025
@shorowit shorowit merged commit d9e1aff into master Feb 20, 2025
@shorowit shorowit deleted the neep_ashp_sample_files2 branch February 20, 2025 20:01
shorowit added a commit that referenced this pull request Feb 20, 2025
@shorowit
Update documentation/changelog to reflect current use of detailed per…
55583b1 
…formance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from #1935.
@joseph-robertson joseph-robertson mentioned this pull request Feb 20, 2025
Merged
20 tasks
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Apr 14, 2025
@shorowit
Squashed 'hpxml-measures/' changes from 9c139ec8f6..d3ae2006f6
490136c 
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: hpxml-measures
git-subtree-split: d3ae2006f6b37b750c57b6236a0dffb3273f4c32
shorowit added a commit to NREL/resstock that referenced this pull request May 12, 2025
@shorowit
Squashed 'resources/hpxml-measures/' changes from 4f317ce603..334acf4de7
866b99d 
334acf4de7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resstock-resnet
ff8dcb314b Update workflow docs.
6a8e771cd4 Add panels to capabilities list.
00fd4c7507 Update the changelog.
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
facf4b7bca Latest results.
528a581097 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
05135c7e84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
6070707c53 Merge pull request #1958 from NREL/model_output_requests
f45c1ab8b3 Another try.
ce7ad07333 Attempted fix for unused schedule
b6a3acda19 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into model_output_requests
239c095001 Merge pull request #1900 from NREL/schematron_sch
0e4b05eaaa Bugfixes.
0a7b864e33 Fix docs
012b2af8d2 Disable test
1b4270dafd OSW bugfix
9bfcc6475f Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into schematron_sch
79413b9e2b Update new output variables
2246fee528 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into model_output_requests
46ee7fc002 Latest results.
0fd511281b Tiny cleanup [ci skip]
3820c2d8b5 Try CI w/ develop docker container
60dd79da0c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
6286e57505 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
d8faacd1b8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6b8bd42a4d Use NREL/OpenStudio#5384 [ci skip]
03ddf2f303 Set GSHP bore hole top depth. Temporary workaround for evap cooler issue. [ci skip]
cd146b6505 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
d856eed9c9 Handle OutputTableMonthly objects, cleanup. [ci skip]
52f6669269 Update ReportUtilityBills and meta_measure.rb [ci skip]
a622ca85ed Testing NREL/OpenStudio#5367... not complete because Output:Table:Monthly is not wrapped.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
8d087caf3e Update warnings.
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
da40be9e52 Skip more warnings. [ci skip]
b7922d74dc Temporary warning exception [ci skip]
8499a00f59 Update docs [ci skip]
2090b59ca2 Revert [ci skip]
287da47f53 Initial test of OS 1.10.0 [ci skip]
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
8fe19e51d3 Renames the schematron file extension to .sch.
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 334acf4de76e8019aaddd31d26111008d3dcf3cc
shorowit added a commit to NREL/resstock that referenced this pull request May 16, 2025
@shorowit
Squashed 'resources/hpxml-measures/' changes from 31ee3db039..b5e911173a
c4d5355 
b5e911173a Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resstock-resnet
3cd6a2fa11 Merge branch 'resstock' of https://github.com/NREL/OpenStudio-HPXML into resstock-resnet
7bdb234639 Improve warning thresholds for newer metrics.
366e9c460a Latest results.
45c0077dd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9f63fe4c95 Merge pull request #2012 from NREL/reporting_measure_sum_check
9b07d8080f Use a percentage check rather than an absolute value (since different outputs have different units - MBtu, kWh, lb, etc.).
784c9afe57 Latest results.
af7648f0c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
16975965ca Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resstock-resnet
3cd1002276 Use lowercase for argument
ee35319813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
334acf4de7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resstock-resnet
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
0fd511281b Tiny cleanup [ci skip]
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: resources/hpxml-measures
git-subtree-split: b5e911173ab95de044d7692fc9d77a3dd49b6a80
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Jun 4, 2025
@shorowit
Squashed 'hpxml-measures/' changes from 50c73b53b1..fa21822d5c
484ffac 
fa21822d5c Latest results.
42ce5fc9ed Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd7 docs and changelog
01db50f39e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f3 Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d16 Latest results.
423923293f update hpxmls
c667c28dd8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe8 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc662 fix unit tests
7c18d97d73 Latest results.
619edead95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fda use objecttype instead of names
b8c08bc2de fixed unit multiplier cases not adding sensors to total loads program
a6bca8b578 address delivered heating
8d68c5505d Update test, take 2
a4be5f2bfc Update test.
617ae4dd89 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
f365f40f7f Latest results.
0f8784fc65 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb006 Revert custom meter reporting for delivered heating
99619831ba Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af0705fb66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4d fix reporting issue using custom meter, small refactors
dedf3ac7e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9b767aee82 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34e Latest results.
a8d9fb2824 Remove unnecessary file, add error check and test.
84d69c5820 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab338 Update comments [ci skip]
ac1db586a8 Latest results.
74daba0f37 Update default based on ducted vs ductless.
e256d60d16 Update Changelog.md [ci skip]
7bdb234639 Improve warning thresholds for newer metrics.
12c7d9eac4 Latest results.
0124dd08de Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f0 Latest results.
5a17797416 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460a Latest results.
45c0077dd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
0757c12306 Latest results.
5a6e4872f8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea588 forgot to change the argument order while refactoring unit tests
04ec8e55ce Latest results.
a89953c8dd separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f9 Latest results.
19d26fe196 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9f Update test.
653d390f89 Latest results.
6bac58757d First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313ce Latest results.
784c9afe57 Latest results.
e1ca0f1c92 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cd1002276 Use lowercase for argument
b04a3e9479 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee35319813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9431044a35 Latest results.
3a154d127f temporarily removed some EMS check due to refactoring for advanced defrost model
70c37ad045 Latest results.
e06a624a97 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e77d7c841e apply the reporting fix to advanced defrost models too.
78b25bcf02 fix reporting, using Jon proposed equations to calculate supp heat
8585bcaabe Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f6 fix ci
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
fa9bc9f40c Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
0fd511281b Tiny cleanup [ci skip]
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
b303f5d4ac first cut to add defrost EMS, only applied to default defrost models for now
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: hpxml-measures
git-subtree-split: fa21822d5c593269d5d63aa450861183636af0cb
shorowit added a commit to NREL/resstock that referenced this pull request Jun 4, 2025
@shorowit
Squashed 'resources/hpxml-measures/' changes from 50c73b53b1..acd4fb12ee
665edbc 
acd4fb12ee Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
cb4dde224f Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c5b0b9efb2 unit test for delivered heating loads
fa21822d5c Latest results.
967274f0e7 Latest results.
42ce5fc9ed Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd7 docs and changelog
01db50f39e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f3 Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d16 Latest results.
423923293f update hpxmls
c667c28dd8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe8 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc662 fix unit tests
7c18d97d73 Latest results.
619edead95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fda use objecttype instead of names
b8c08bc2de fixed unit multiplier cases not adding sensors to total loads program
a6bca8b578 address delivered heating
8d68c5505d Update test, take 2
a4be5f2bfc Update test.
617ae4dd89 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
f365f40f7f Latest results.
0f8784fc65 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb006 Revert custom meter reporting for delivered heating
99619831ba Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af0705fb66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4d fix reporting issue using custom meter, small refactors
dedf3ac7e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9b767aee82 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34e Latest results.
a8d9fb2824 Remove unnecessary file, add error check and test.
84d69c5820 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab338 Update comments [ci skip]
ac1db586a8 Latest results.
74daba0f37 Update default based on ducted vs ductless.
e256d60d16 Update Changelog.md [ci skip]
7bdb234639 Improve warning thresholds for newer metrics.
12c7d9eac4 Latest results.
0124dd08de Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f0 Latest results.
5a17797416 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460a Latest results.
45c0077dd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
0757c12306 Latest results.
5a6e4872f8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea588 forgot to change the argument order while refactoring unit tests
04ec8e55ce Latest results.
a89953c8dd separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f9 Latest results.
19d26fe196 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9f Update test.
653d390f89 Latest results.
6bac58757d First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313ce Latest results.
784c9afe57 Latest results.
e1ca0f1c92 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cd1002276 Use lowercase for argument
b04a3e9479 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee35319813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9431044a35 Latest results.
3a154d127f temporarily removed some EMS check due to refactoring for advanced defrost model
70c37ad045 Latest results.
e06a624a97 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e77d7c841e apply the reporting fix to advanced defrost models too.
78b25bcf02 fix reporting, using Jon proposed equations to calculate supp heat
8585bcaabe Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f6 fix ci
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
fa9bc9f40c Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
0fd511281b Tiny cleanup [ci skip]
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
b303f5d4ac first cut to add defrost EMS, only applied to default defrost models for now
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: resources/hpxml-measures
git-subtree-split: acd4fb12ee68163964169c8ad3ef2b787906c1b1
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Jun 7, 2025
@shorowit
Squashed 'hpxml-measures/' changes from 6498775aac..a4e0af94dd
8126511 
a4e0af94dd Latest results.
6e264b3835 Update test due to new error check on fan motor type.
a8f23e0b8e Add sample file for fan motor type.
a9d4ad242d Change DFHP min compressor temperature default from 25F to 40F.
861e6071cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2779cfecf8 Merge pull request #1987 from NREL/resnet_defrost
f28f2c1db5 shift backup defrost energy by one timestep due to the EMS lag
aa6c69d0e7 Latest results.
6e2899c4bf minor ruby doc update
b4c59d510b combine pan heater and defrost ems program
acd4fb12ee Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
cb4dde224f Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c5b0b9efb2 unit test for delivered heating loads
fa21822d5c Latest results.
967274f0e7 Latest results.
42ce5fc9ed Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd7 docs and changelog
01db50f39e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f3 Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d16 Latest results.
423923293f update hpxmls
c667c28dd8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe8 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc662 fix unit tests
7c18d97d73 Latest results.
619edead95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fda use objecttype instead of names
b8c08bc2de fixed unit multiplier cases not adding sensors to total loads program
a6bca8b578 address delivered heating
8d68c5505d Update test, take 2
a4be5f2bfc Update test.
617ae4dd89 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
f365f40f7f Latest results.
0f8784fc65 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb006 Revert custom meter reporting for delivered heating
99619831ba Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af0705fb66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4d fix reporting issue using custom meter, small refactors
dedf3ac7e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9b767aee82 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34e Latest results.
a8d9fb2824 Remove unnecessary file, add error check and test.
84d69c5820 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab338 Update comments [ci skip]
ac1db586a8 Latest results.
74daba0f37 Update default based on ducted vs ductless.
e256d60d16 Update Changelog.md [ci skip]
7bdb234639 Improve warning thresholds for newer metrics.
12c7d9eac4 Latest results.
0124dd08de Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f0 Latest results.
5a17797416 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460a Latest results.
45c0077dd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
0757c12306 Latest results.
5a6e4872f8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea588 forgot to change the argument order while refactoring unit tests
04ec8e55ce Latest results.
a89953c8dd separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f9 Latest results.
19d26fe196 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9f Update test.
653d390f89 Latest results.
6bac58757d First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313ce Latest results.
784c9afe57 Latest results.
e1ca0f1c92 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cd1002276 Use lowercase for argument
b04a3e9479 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee35319813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9431044a35 Latest results.
3a154d127f temporarily removed some EMS check due to refactoring for advanced defrost model
70c37ad045 Latest results.
e06a624a97 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e77d7c841e apply the reporting fix to advanced defrost models too.
78b25bcf02 fix reporting, using Jon proposed equations to calculate supp heat
8585bcaabe Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f6 fix ci
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
fa9bc9f40c Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
0fd511281b Tiny cleanup [ci skip]
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
b303f5d4ac first cut to add defrost EMS, only applied to default defrost models for now
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: hpxml-measures
git-subtree-split: a4e0af94ddd9e31a318fb00d11fe6743f887ebba
shorowit added a commit to NREL/OpenStudio-ERI that referenced this pull request Jun 25, 2025
@shorowit
Squashed 'hpxml-measures/' changes from 25c281fae1..56d89fb016
d2dd86d 
56d89fb016 Merge pull request #1879 from NREL/resnet_heat_pump
fd488dce6a Merge pull request #2016 from NREL/hvac_docs
732210fd1c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
f69c65f551 Merge pull request #2015 from NREL/resnet_defrost_model_type
f6ee9bebd0 Latest results.
2663478c88 Minor cleanup.
64119ebbe7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
27f86c2fe6 Latest results.
a0eb8a12c5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a484a7348f Merge pull request #2028 from NREL/clothes_dryer_drying_method
d9253688bb Latest results.
5ff66cfc66 Latest results.
c3439adabf Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
9dc0cd065a First pass on new ClothesDryer/DryingMethod input.
c5fd8cbe5a Latest results.
c4a570f312 Update new test.
e23ac5b358 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
1b19b1b5f9 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a0f46171e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
de99f9534d Latest results.
214a357fa4 Address FIXMEs.
bd251ee5a3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
7d0542d9ec Merge pull request #2026 from NREL/Branch_resnet_heat_pump_conflict
f86d5e03ee Latest results.
71bfbde203 Relax 10x tolerance for duct component loads
fe4e28afbd Merge pull request #2025 from NREL/os310rc5
fba8416edb Update to OS 3.10.0 official.
64c73feb70 Merge branch 'master' into os310rc5
e6993eea0f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Branch_resnet_heat_pump_conflict
d0c90f5436 resolve conflicts on pulling latest master
8a49f0b8cb Test OS 3.10.0-rc5 release.
d20eaf3cd6 adding unit tests for fan cfm, power, and c_d
c743c1f957 Latest results.
67cdef1701 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
fb24af465a Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
85a85befc7 Update GSHP tests.
796696fba0 Latest results.
6ca392a65d Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c4f66e7233 Simplify fan motor type defaulting to use compressor type for all HVAC types.
5a2d6f4aaa small cleanup on defrost unit test
92cec5c717 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a4e0af94dd Latest results.
6e264b3835 Update test due to new error check on fan motor type.
a8f23e0b8e Add sample file for fan motor type.
a9d4ad242d Change DFHP min compressor temperature default from 25F to 40F.
861e6071cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2779cfecf8 Merge pull request #1987 from NREL/resnet_defrost
f28f2c1db5 shift backup defrost energy by one timestep due to the EMS lag
aa6c69d0e7 Latest results.
6e2899c4bf minor ruby doc update
b4c59d510b combine pan heater and defrost ems program
acd4fb12ee Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
cb4dde224f Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c5b0b9efb2 unit test for delivered heating loads
fa21822d5c Latest results.
967274f0e7 Latest results.
42ce5fc9ed Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd7 docs and changelog
01db50f39e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f3 Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d16 Latest results.
423923293f update hpxmls
c667c28dd8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe8 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc662 fix unit tests
7c18d97d73 Latest results.
619edead95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fda use objecttype instead of names
b8c08bc2de fixed unit multiplier cases not adding sensors to total loads program
a6bca8b578 address delivered heating
8d68c5505d Update test, take 2
a4be5f2bfc Update test.
617ae4dd89 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
5eb1c9c0ba Bugfix.
1f583ec2d4 Bugfix.
8e48db9929 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
b0e842902d Completed pass. Moved some code from hvac.rb to defaults.rb.
f552ac2555 Latest results.
e7accddfb7 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
f365f40f7f Latest results.
acff77f642 Some more progress [ci skip]
0f8784fc65 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb006 Revert custom meter reporting for delivered heating
14dbbc9862 Initial pass on fully documenting hvac.rb plus a little code refactoring/cleanup. A bit more to do still.
c3a388afc8 Clean up Changelog.md [ci skip]
0cb3dabb74 Update URL
0e2288667d Remove DefrostModelType and advanced model type; now using RESNET model for everything going forward.
99619831ba Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af0705fb66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4d fix reporting issue using custom meter, small refactors
dedf3ac7e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9b767aee82 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34e Latest results.
a8d9fb2824 Remove unnecessary file, add error check and test.
84d69c5820 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab338 Update comments [ci skip]
ac1db586a8 Latest results.
74daba0f37 Update default based on ducted vs ductless.
e256d60d16 Update Changelog.md [ci skip]
7bdb234639 Improve warning thresholds for newer metrics.
12c7d9eac4 Latest results.
0124dd08de Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f0 Latest results.
5a17797416 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460a Latest results.
45c0077dd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
0757c12306 Latest results.
5a6e4872f8 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea588 forgot to change the argument order while refactoring unit tests
04ec8e55ce Latest results.
a89953c8dd separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f9 Latest results.
19d26fe196 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9f Update test.
653d390f89 Latest results.
6bac58757d First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313ce Latest results.
784c9afe57 Latest results.
e1ca0f1c92 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cd1002276 Use lowercase for argument
b04a3e9479 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee35319813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9431044a35 Latest results.
3a154d127f temporarily removed some EMS check due to refactoring for advanced defrost model
70c37ad045 Latest results.
e06a624a97 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c4a12be3ca Latest results.
8b887f9730 Update test values
bbdfc1fc3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e77d7c841e apply the reporting fix to advanced defrost models too.
78b25bcf02 fix reporting, using Jon proposed equations to calculate supp heat
8585bcaabe Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f6 fix ci
dd92aa7fd8 Update a couple tests
849ce966d9 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee Latest results.
e2edb24450 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
fa9bc9f40c Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
0fd511281b Tiny cleanup [ci skip]
cec4f8b937 use iq curve coefficients
c7cdffaca8 address comments
310e20b475 Latest results.
2c96bc1bcf Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0a Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2 Latest results.
873103a6a2 Fix CI test.
f6d74adff6 update measures
8b9d546d62 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5 further conflicts to resolve
e111136b6a Trigger CI
0d52404bad Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661 Latest results.
2a34ac36bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc158 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
b303f5d4ac first cut to add defrost EMS, only applied to default defrost models for now
9ccd5d8559 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9 Latest results.
2aaa26b557 Eliminate minor diffs.
c26d351d2d Latest results.
f464e1d2ce Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c089 Merge pull request #1984 from NREL/equipment_type
ec1754e792 Latest results.
36df0b51df First pass on separating design and actual (installed) airflow rates in the code.
4830903eb4 Typos.
3f3d99a57d Missed one docs update
ce9b7f05f4 Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3 Latest results.
5420232ca9 Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb248 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bb Rename HPXML element for clarity.
b4d41409ff Latest results.
f75906c6ab Exclude pan heater if heat pump is only used for cooling.
26bbf1a127 Latest results.
5e33bfa952 Remove EER input from ASHP 1-speed sample files.
c7daa100b2 Misc cleanup and refactor.
d3ae2006f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a1 Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08 Update docs.
105e910af5 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f7 Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a Update tests.
d822a91479 Bugfix.
460d37ca3f Latest results.
0b28ce5b32 Update GSHP tests for rated airflow.
83487b0fda Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36b Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9 Latest results.
54d5d24cd7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab0 A little cleanup of docs/changelog [ci skip]
37c9886ca8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731 Merge pull request #1964 from NREL/hvac_airflow
478bc02285 Latest results.
ff0ff823ac Bugfix.
ed6141af4b Update Changelog.md [ci skip]
ed9b104594 Update tests.
95941d1769 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1 Latest results.
cd85ad75b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9159707137 Merge pull request #1968 from NREL/gross_shr
a4daad2e06 Latest results.
af0023a7cb Address a couple FIXMEs
634af4abbd Remove SHR attribute from HPXML class.
06d51516cc Latest results.
a24e809719 Update docs and a little more cleanup.
a7811bae8c Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc8 Latest results.
b57b66bd92 Update HPXMLs.
df8cb2a970 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cba Revert new airflow inputs for now.
6f5b011d9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb Latest results.
eb8432d963 Accommodate 40F cooling test.
8fdc4add43 Latest results.
78002155d3 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509 Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b Latest results.
2bdea1d161 Simplify/cleanup code.
6bc20525a8 Fix test.
8bf6468f65 Latest results.
cfe3af12f1 Bugfix for heating-only HPs.
ff3b027799 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446 Latest results.
c8d10f829e Handle systems w/ integrated heating.
e914fafe71 Bugfix.
44bc9c9b04 Initial progress.
3ea471aa07 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd9 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b Latest results.
067c066c73 Fix changelog [ci skip]
1a96466db3 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8d Latest results.
93378846ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda200 Initial progress.
cbcd544e34 Latest results.
4a620d2590 Bugfix for HP w/o heating.
795dc0ff90 Bugfix.
8199cc7c70 Bugfix.
82e8b1999f Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219 Latest results.
d45b4f5356 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea87119 Latest results.
e66b367aca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8 Latest results.
3addc293b3 Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8c Latest results.
a57d4135ae Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa Bugfix. Update/simplify tests.
6ddda82035 Latest results.
f0da1c23f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbd Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d72 Latest results.
9944a5507f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb0 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972 Latest results.
2d21df6783 Address review comments.
99e1de8c4c Latest results.
3c9734d8da A little code refactoring.
ba82c84e37 Expand tests to cover more outdoor temperatures.
5e4f0f67cd Latest results.
76af612a41 Latest results.
fb6467e1c0 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f9837 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c Latest results.
f4ce9f047d Add sample files.
c13975e87a Merge pull request #1937 from NREL/compressor_type
86370e65ac Latest results.
11ee9c8dce Bugfixes.
2a9c2b81c5 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e2 Latest results.
5f82c27016 Relax schematron checks.
581cc7ac02 Bugfix.
33223fb125 Bugfix.
fa54726b42 Bugfixes, cleanup.
d63f1b6148 Latest results.
eb1ba618f2 Fix tests. Move a couple methods to model.rb.
5c7420f9cd Latest results.
13ab9a6efb Fix a couple tests.
9543b16d58 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650 Revert order of measure args.
6b88c50e2a Add/update tests.
c596e2f7c1 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb06 Latest results.
974ccbde62 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49 Latest results.
c5b4f62790 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622 Latest results.
99e752e48e Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783f Initial progress.
c4973ad6be Latest results.
d8e9e2ff56 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e Latest results.
0679d22925 Small fixes.
0bd35e0441 Fix CI error for WLHP simulations
c4378f1e89 Bugfix and update test.
1d95fa3b7f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6 Latest results.
3658a9cc27 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de Add unit test and minor cleanup.
e2dd025d8a Bugfix for when there are no heating unavailable periods.
eaab755028 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df Apply space heating unavailable periods.
bad50335c6 Latest results.
e9c8a78050 Add RTF to the calculation, revert unit multiplier.
74af33b012 Clarify defrost mode [ci skip]
f00d43dc22 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbda Apply unit multiplier.
fea7655aef Bugfix.
6a3ce395b3 Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bb Fix new arg description.
e6c1e2d834 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777 Latest results.
88747ff326 Just a little cleanup.
48354274e1 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
6244315651 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b fix unit tests with nominal datapoints being optional
09de5d89c0 Latest results.
c1b85eccd5 fix test file fraction of nominal
c86c1f585e oops
820442e1d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e985386210 relax requirements for nominal speed data points
73c8ff151a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e EPvalidator.xml improvements
6b268d3137 update measures
60679598cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c751 improve epvalidator for capacity consistency
f5e09fe989 Update expected values.
c0328e4ceb Latest results.
2c65c7dc9d Latest results.
e00c9e9a98 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917 More fix on the BuildResidential test
c3880879d3 Fix measure; not sure what happened before.
c47adc8fbc Fix CI failure.
18b999542b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27f fix some ci errors
b52c0ca96c add unit test for default variable speed detailed performance data
2eed57d7e2 Latest results.
785774a7d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf8 Latest results.
d4092dbfd6 oops, specified the wrong capacities
5c17fccf83 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b fix pthp hspf calculation
a0e3b2fbc5 more fixes, update measures
5329c9d368 bugfixes
0b219eb58c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d revert 17F requirement, first cut to model 3 speeds
b65e5da5de fix bugs in current capacity17F and retention
5869e03e6c fix compressor type default using seer
f191e0beb1 fix a few issues to run test files
3f0b0e3281 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a update measures
5d2d34e663 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7e Latest results.
0f16d7ccd9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1 Latest results.
1dfc3c60b1 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318 Latest results.
e698b9be2e Bugfix and rename variables for clarity.
2d40a2c948 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2 Latest results.
2851dd1fba Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1d Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687a Latest results.
e3badf5be1 Update test.
5848d907ab Forgot to commit these changes too
03cd5f1f70 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5 Latest results.
03f284c2aa Remove debug code
da7b493ccd Fix adaptive step size method and address PR review comments.
5634c0ab76 Small docs image improvement [ci skip]
ba5a075b0b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e Latest results.
4e79872526 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a Latest results.
63204b7ca5 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb537 update measure
061a46a0c4 fix max power program
631fd33b13 Revert max compressor temp input.
d01e7fff9b Fixes some CI failures.
fc63ba3e18 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744b Latest results.
d67c410c18 simplify indoor temperature bounds
b2caf33a6a elsif instead of else
bb03af4021 power calculation for ptac/pthp
b90c06613b Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a Simplify implementation to remove step search [ci skip]
3ea0043476 Perform extrapolation until values become negative.
11d271c06c Minor code cleanup.
143b37ec3b Simplify extrapolation bounds.
5a8c811d43 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d1788 Add capacity & power datapoint checks.
5bdc5548e4 update calculate_fan_power_from_curve
f317c3636f simplify calculate_fan_power_from_curve and minor doc fix
46c13626f4 update EPvalidator.xml
85effef4b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a6 Latest results.
889667dff8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e Use uppercase letters for PSC/BPM, add full names in docs
8a5597585d Update comment [ci skip]
fc157cf39a Latest results.
d1b6749aa7 Update Changelog.md
c36aa2f085 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dc First pass.
c18ed4fdba Small bugfix and cleanup.
6b2f3e86c4 Update default crankcase heater power.
b4beb83e44 Merge pull request #1902 from NREL/eer_defaults
7a1d223914 Latest results.
74696c4bfc Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8 Eliminate diffs
8fdffff23b Latest results.
f5d763a612 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ed Latest results.
2e79ad352c Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252 Latest results.
00db61d4bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb3 fix unit tests
1a574b78d7 Merge pull request #1897 from NREL/eer_inputs
e759a59f5a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6 Latest results.
6c97afbd21 update measures
2d3dee308b remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab4 Latest results.
4fa0b692b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a Latest results.
f0c441fce2 Allow CI simulation results even when unit tests fail.
4c4b2bfeec Fix approach, use placeholder.
96c7f41df8 A couple more comments [ci skip]
32d32c9eb0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95d Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5 one more rename
7ffcbff6f2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da renamed fanmotortype, and started variable speed assumption update
c495f89809 Latest results.
01c53159f0 Latest results.
abb96630b8 added temperature bounds for indoor sensitivity
7a5f48abb3 Updated indoor sensitivity coefficients
1edbedd66b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a01 Latest results.
9c9d5be994 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911 update measures
f05a5bfb05 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba6 Latest results.
ac9c0e19dc temporarily reverted indoor sensibility change
bf5d323ab1 update_measures
554f49ad1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b7 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd83 Latest results.
b40b1e6c7c one more fix
a7d4806c59 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb update measures
7e5af49260 updated fan watts per cfm default, added fan model type

git-subtree-dir: hpxml-measures
git-subtree-split: 56d89fb01664e07ce4f1b8b88e37b228c9a9e03c
shorowit added a commit to NREL/OpenStudio-HPXML-Calibration that referenced this pull request Jun 30, 2025
@shorowit
Squashed 'src/OpenStudio-HPXML/' changes from c78a94c30..ff0e7c541
b9628ec 
ff0e7c541 Merge pull request #2035 from NREL/hpxml_version
22a0f0588 Latest results.
48921acd6 Bump version to 1.11 and pull in HPXML v4.2-rc3.
ec7affe82 Minor changelog cleanup [ci skip]
baaa57c5b MINHERS -> HERS
d15c98cd8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
ec6d0c33b Update a couple comments [ci skip]
0017c6dac Merge pull request #2034 from NREL/hers_hvac_tests
ac0cac018 Just leave it.
c89327ce2 Address FIXMEs
438c2f2b0 Re-enable HERS HVAC tests.
d934b003e Merge pull request #2032 from NREL/eri_latest
03be9f038 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eri_latest
26c7f39e6 Merge pull request #2033 from NREL/hvac_interp_bug
3486e9f16 Latest results.
ae87f509b Fixes possible interpolation bug when calculating min speed values for two/variable speed systems.
3bb5c80f6 Latest results.
c30cb5423 Sync with https://github.com/NREL/OpenStudio-ERI/pull/779
87cc1839b Merge pull request #2030 from NREL/default_infil_height_and_volume
54ee52810 Latest results.
9d5949b94 Merge branch 'default_infil_height_and_volume' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
420b3d798 Fix average ceiling height in cathedral ceiling sample file, update tests.
5198e5d96 Latest results.
6c0465c0a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
56d89fb01 Merge pull request #1879 from NREL/resnet_heat_pump
fd488dce6 Merge pull request #2016 from NREL/hvac_docs
732210fd1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
f69c65f55 Merge pull request #2015 from NREL/resnet_defrost_model_type
f6ee9bebd Latest results.
2663478c8 Minor cleanup.
64119ebbe Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
27f86c2fe Latest results.
a0eb8a12c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
eaa4b32ed Remove debug
d164eaba1 A few more tests.
99ab08d3a Merge branch 'default_infil_height_and_volume' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
7ead41647 Minor docs update [ci skip]
e62e94e05 Latest results.
1b9efc246 Update EPvalidator.sch
bffac0678 Include assumed rim joist height between stories.
573f18543 Improve docs [ci skip]
6cf473dd9 Bugfix.
d709ac6ec Latest results.
fe27922cc Update docs/changelog [ci skip]
af2203a64 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
a484a7348 Merge pull request #2028 from NREL/clothes_dryer_drying_method
15c2d855c Latest results.
ba6a26ff5 Update tests.
39d082338 First pass on updating default infiltration height/volume calculations.
d9253688b Latest results.
5ff66cfc6 Latest results.
c3439adab Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
9dc0cd065 First pass on new ClothesDryer/DryingMethod input.
c5fd8cbe5 Latest results.
c4a570f31 Update new test.
e23ac5b35 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
1b19b1b5f Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a0f46171e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
de99f9534 Latest results.
214a357fa Address FIXMEs.
bd251ee5a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
7d0542d9e Merge pull request #2026 from NREL/Branch_resnet_heat_pump_conflict
f86d5e03e Latest results.
71bfbde20 Relax 10x tolerance for duct component loads
fe4e28afb Merge pull request #2025 from NREL/os310rc5
fba8416ed Update to OS 3.10.0 official.
64c73feb7 Merge branch 'master' into os310rc5
e6993eea0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Branch_resnet_heat_pump_conflict
25c281fae Merge pull request #2024 from NREL/fixed-charges-unused-fuels
c6c277d4a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fixed-charges-unused-fuels
1187602d4 Update measure.xml [ci skip]
c20d33550 Clean up ReportUtilityBills sample JSON files.
d0c90f543 resolve conflicts on pulling latest master
8a49f0b8c Test OS 3.10.0-rc5 release.
b2ca6010a Cleanup and update changelog.
d20eaf3cd adding unit tests for fan cfm, power, and c_d
9a0ed3303 Latest results.
f83c79e47 Update bill tests to assume sample building has all fuels.
1dd6c70cc Get utility rates based on presence of fuels vs nonzero consumption.
5953834fd Add a bill test for checking natural gas fixed and energy costs in HI.
aa8fb9224 Merge pull request #2021 from NREL/update_sample_files2
61c0b8d35 Latest results.
a9b5fc4ef Update sample files to reduce diffs in other branches.
c743c1f95 Latest results.
67cdef170 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
fb24af465 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
85a85befc Update GSHP tests.
796696fba Latest results.
6ca392a65 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c4f66e723 Simplify fan motor type defaulting to use compressor type for all HVAC types.
5a2d6f4aa small cleanup on defrost unit test
92cec5c71 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a4e0af94d Latest results.
6e264b383 Update test due to new error check on fan motor type.
a8f23e0b8 Add sample file for fan motor type.
a9d4ad242 Change DFHP min compressor temperature default from 25F to 40F.
861e6071c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6498775aa Merge pull request #2019 from NREL/update_sample_files
2779cfecf Merge pull request #1987 from NREL/resnet_defrost
a167679b0 Latest results.
f28f2c1db shift backup defrost energy by one timestep due to the EMS lag
5bdcfe043 A bit more.
f71bb2ba0 Update sample files to reduce diffs in other branches.
aa6c69d0e Latest results.
6e2899c4b minor ruby doc update
b4c59d510 combine pan heater and defrost ems program
acd4fb12e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
cb4dde224 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c5b0b9efb unit test for delivered heating loads
a67437cc3 Remove a couple unused methods.
fa21822d5 Latest results.
967274f0e Latest results.
42ce5fc9e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd docs and changelog
01db50f39 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d1 Latest results.
423923293 update hpxmls
c667c28dd Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc66 fix unit tests
7c18d97d7 Latest results.
619edead9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fd use objecttype instead of names
b8c08bc2d fixed unit multiplier cases not adding sensors to total loads program
50c73b53b Merge pull request #1946 from NREL/resstock
0bc79d5d3 Bugfix.
20d93153d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resstock
4c1e33e37 Merge pull request #2018 from NREL/hpxml_42rc1
5674adef7 Consolidate duplicate logic.
e288f6399 Register panel outputs from reporting measure instead.
859814d1a Update to rc2
aa3c339e5 Oops, missed these
639df8331 Pull in HPXML 4.2-rc1 schema
9c2541089 Call new method from ReportUtilityBills too.
abda0590a Create a method for registering to the runner; call from both HPXMLtoOpenStudio and ReportSimulationOutput.
1c7909f31 Default spa and pool pump to 240V.
fbe9d5ecf Simplify these error checks.
13d2d0139 Improve components validation message.
cc82bda40 Remove the not found for service feeder error from components method.
d398feeca Merge branch 'master' into resstock
4d25a696b Update outputs method, docs, and real home sample file.
4c418d072 Merge pull request #2017 from NREL/os310rc1
a12302b5c Latest results.
881e0b653 Missed these
4b39c387b Test OS 3.10.0-rc1 release
853e1f3d3 Add required baseline peak power for sample file.
a6bca8b57 address delivered heating
8d16f677a Update validator, branch circuit components method, peak power constraints.
081295a48 Latest results.
e83361256 More component types for branch circuits, write output file before simulation, reverse voltage defaulting
8d68c5505 Update test, take 2
a4be5f2bf Update test.
617ae4dd8 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
5eb1c9c0b Bugfix.
1f583ec2d Bugfix.
8e48db992 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
b0e842902 Completed pass. Moved some code from hvac.rb to defaults.rb.
f552ac255 Latest results.
e7accddfb Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
f365f40f7 Latest results.
acff77f64 Some more progress [ci skip]
0f8784fc6 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb00 Revert custom meter reporting for delivered heating
14dbbc986 Initial pass on fully documenting hvac.rb plus a little code refactoring/cleanup. A bit more to do still.
c3a388afc Clean up Changelog.md [ci skip]
0cb3dabb7 Update URL
0e2288667 Remove DefrostModelType and advanced model type; now using RESNET model for everything going forward.
99619831b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c69a9a36a Couple of argument name typos.
af0705fb6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4 fix reporting issue using custom meter, small refactors
33c088889 Fold branch_circuits and service_feeders logic into methods.
d2f0cc668 Expose only one HP power rating argument.
244dcc2c5 Revert removing simultaneous backup operation.
f56891c6e Assume no simultaneous backup operation.
1286dc1cd More argument description cleanup.
8c02e2af8 Better describe defaults for panel spaces.
22095c8b9 Merge branch 'master' into resstock
dedf3ac7e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
e5de5ab70 Merge pull request #1996 from NREL/water_heater_misc
d34f1ec91 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into water_heater_misc
9b767aee8 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34 Latest results.
9c5068b7c Use shared 15A default for AHU.
a8d9fb282 Remove unnecessary file, add error check and test.
5620c6b64 Change amp default from 20A dedicated to 15A shared.
2cf3381af Fix docs.
0a6482cb9 Remove HP voltage argument from build measure.
64cdffdcf Clean up argument names.
d730a8ed1 Update defaults test and workflow outputs docs.
1201eb606 Merge branch 'master' into resstock
21bc7fc0a Merge pull request #2014 from NREL/dup_emission_outputs
153d32043 Oops, missed this one.
568596ac5 Add check and test for branch circuit voltage greater than panel voltage.
36b54cd4a A little cleanup refactoring.
09f0ee2b9 Fix argument references for ventilation fans.
d4f1cf2fe Move EV charger defaulting, update docs.
fd968ad7c Bugfix.
a5fb8cd2c Allow both headroom and rated total breaker spaces.
d92e7724d Add code that checks for duplicate outputs.
847b89975 Update the input for baseline peak power.
d28e841a8 Updates to build measure, validator, docs.
38902cd09 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resstock
84d69c582 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab33 Update comments [ci skip]
ac1db586a Latest results.
74daba0f3 Update default based on ducted vs ductless.
e256d60d1 Update Changelog.md [ci skip]
7bdb23463 Improve warning thresholds for newer metrics.
12c7d9eac Latest results.
0124dd08d Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f Latest results.
5a1779741 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460 Latest results.
45c0077dd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9f63fe4c9 Merge pull request #2012 from NREL/reporting_measure_sum_check
0757c1230 Latest results.
9b07d8080 Use a percentage check rather than an absolute value (since different outputs have different units - MBtu, kWh, lb, etc.).
5a6e4872f Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea58 forgot to change the argument order while refactoring unit tests
04ec8e55c Latest results.
a89953c8d separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f Latest results.
19d26fe19 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9 Update test.
653d390f8 Latest results.
6bac58757 First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313c Latest results.
784c9afe5 Latest results.
e1ca0f1c9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
31ee3db03 Merge branch 'master' into resstock
18f68f58c Merge pull request #2007 from NREL/buildressched_remove_simple_schedules
3b416c40c Merge branch 'buildressched_remove_simple_schedules' of https://github.com/NREL/OpenStudio-HPXML into buildressched_remove_simple_schedules
281659089 Fix handling of EVs, update test.
da87e3c3c Merge branch 'master' into buildressched_remove_simple_schedules
3cd100227 Use lowercase for argument
652750a7c Merge branch 'master' into resstock
b04a3e947 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee3531981 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
646dd427a Merge pull request #1939 from NREL/os1_10_0
0aea995b1 Latest results.
f4429e908 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
4100830c6 Latest results.
912b185b0 Add workflow test for checking panel outputs.
456d0db82 Remove any simple schedules in the HPXML file when we produce stochastic schedules to be used instead. Prevents warnings.
c3f6928d1 Add more defaults tests.
2a8c858c5 Move real home 054 to 051.
ff8dcb314 Update workflow docs.
6a8e771cd Add panels to capabilities list.
00fd4c750 Update the changelog.
9431044a3 Latest results.
3a154d127 temporarily removed some EMS check due to refactoring for advanced defrost model
4f317ce60 Latest results.
cec8bb99b Update sample files.
70c37ad04 Latest results.
e06a624a9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
d69ae47ea Merge branch 'master' into resstock
c4a12be3c Latest results.
8b887f973 Update test values
bbdfc1fc3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9f9b76d8f Merge pull request #2004 from NREL/duct_design_loads
16ccf84a1 Merge pull request #2005 from NREL/duct_defaults
8f83b551d Latest results.
e195513a9 Merge branch 'duct_defaults' of https://github.com/NREL/OpenStudio-HPXML into duct_design_loads
e77d7c841 apply the reporting fix to advanced defrost models too.
78b25bcf0 fix reporting, using Jon proposed equations to calculate supp heat
29efad581 Latest results.
571544620 BuildResidentialHPXML measure: Improves default duct areas/locations for 1-story buildings with a conditioned basement and ducts located in the attic.
79a6edd50 Add warnings and test.
af0d8c647 Less aggressive solution
8585bcaab Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f fix ci
dd92aa7fd Update a couple tests
9fd81d127 Latest results.
6bdf55798 Update panel test after sample file changes.
dd023261c Update sample files.
00430e0fc Latest results.
71e4106a1 Attempt to improve duct design load calculations.
7e55f1934 Merge branch 'master' into resstock
849ce966d Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
facf4b7bc Latest results.
528a58109 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
66b08cd60 Merge pull request #2003 from NREL/sample_hpxmls_ducts
5dac11722 Latest results.
32bec01ad Another one
cd600ea04 Bump HVAC capacity
a057f1cca Minor cleanup
42d94e3ce Latest results.
a9c394000 Bugfix
d203be205 More changes to support opt-in.
6307f9611 Bugfix.
e2edb2445 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
05135c7e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
5762be77e Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
1df18348a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into sample_hpxmls_ducts
2b298f0da Bugfixes.
c9245b7f2 Progress toward making electric panel feature opt-in.
60cf17c95 Merge branch 'master' into resstock
6070707c5 Merge pull request #1958 from NREL/model_output_requests
f45c1ab8b Another try.
ce7ad0733 Attempted fix for unused schedule
b6a3acda1 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into model_output_requests
239c09500 Merge pull request #1900 from NREL/schematron_sch
df3ff4966 Bugfix for OS-ERI. [ci skip]
0e4b05eaa Bugfixes.
1d28a3d69 Hello GHA?
0a7b864e3 Fix docs
d910430c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into sample_hpxmls_ducts
818e255a7 Use duct area fractions instead of duct areas in sample files. Update duct leakages to XX cfm25 per 100 ft2.
012b2af8d Disable test
1b4270daf OSW bugfix
fa9bc9f40 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9bfcc6475 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into schematron_sch
79413b9e2 Update new output variables
2246fee52 Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into model_output_requests
f1747e120 Merge pull request #2002 from NREL/resnet_81_and_90f_take2
46ee7fc00 Latest results.
0fd511281 Tiny cleanup [ci skip]
3820c2d8b Try CI w/ develop docker container
60dd79da0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
cec4f8b93 use iq curve coefficients
c7cdffaca address comments
d5a275a53 Preserve previous existing for older ERI versions.
310e20b47 Latest results.
2c96bc1bc Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0 Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a Latest results.
873103a6a Fix CI test.
f6d74adff update measures
8b9d546d6 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd further conflicts to resolve
e111136b6 Trigger CI
0d52404ba Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
06318c915 Update years [ci skip]
78dc1fa7a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
f3abe5243 Latest results.
6924fb0e2 Merge branch 'master' into resstock
6d274c4fd Merge pull request #1995 from NREL/resnet_81_and_90f
c239b3ba3 Merge branch 'resnet_81_and_90f' of https://github.com/NREL/OpenStudio-HPXML into resnet_81_and_90f
2e57dc9ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_81_and_90f
cd564a117 Merge pull request #1998 from NREL/buildresschedfile_hpxml_class3
2cf4b018b Latest results.
dd1960231 And now the fix.
8ebe79b5f Disable checks.
9ae5742fe Add test demonstrating the problem when using a defaulted HPXML file.
f229e0c99 Update Changelog and docs [ci skip]
b33a7a146 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_81_and_90f
66aa581d5 Update/cleanup tests.
7473be830 Merge branch 'master' into resstock
739629c53 Merge pull request #1997 from NREL/buildresschedfile_hpxml_class2
428172939 Pull out a new method to make the code clearer.
a64e357c6 Smartly avoid creating a backup file when it's not needed.
4b4f751f1 Add a bit more documentation/explanation for the code.
9f593a51a Latest results.
85402cc8f Update sample files.
59e6cacf2 Merge branch 'master' into resstock
033f2d381 Updates hot water equations per RESNET MINHERS 81 and 90f. Simplify method signatures. [ci skip]
090a26a12 Merge pull request #1878 from NREL/ghp-two-speed-var-speed
263e4c736 Couldn't help myself, just a little code simplification.
279ba3961 Just a few minor things.
70b5f0cf0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
22917ab70 rename simple to standard, fix unit test
6928fc936 Merge pull request #1994 from NREL/reportsimoutput_digits
113cb84ed Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
a4994f09b intermittent pump for all
135100aa7 Latest results.
bb50cf73f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
749b76ee6 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
a75b331bf address comments
3c7890614 Cleans up number of digits used for different outputs plus some misc code refactor/cleanup/documentation.
32703c966 Latest results.
2a34ac36b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2384dce7d Merge pull request #1992 from NREL/tank_model_type_bugfixes
3f6adad88 Super tiny cleanup of a few things. [ci skip]
292cec379 Latest results.
98ef2e9cc Hello GHA?
f3850346c Update test.
f5beb88e2 Fixes tank loss coefficient when TankModelType=stratified for a conventional storage water heater. Adds error-checking to prevent TankModelType=stratified to be used for a non-electric water heater. Some code cleanup.
db6c22d54 Latest results.
8cf2c4409 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
682c4f5f9 clean up hvac sizing, revert plr curve for simple model and advanced var speed
d5fede503 Merge pull request #1982 from NREL/detailed_zone_conditions
87f5360c1 Update changelog, minor code cleanup.
5d2c937a6 Merge branch 'detailed_zone_conditions' of https://github.com/NREL/OpenStudio-HPXML into detailed_zone_conditions
93fcf7f03 fraction instead of lb water per lb dry air
8c00178ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
81ff879da Missed these.
2c95a5ffe Merge pull request #1989 from NREL/rooftype_siding_test_hpxmls
7311c5d68 Remove RoofType and Siding elements from test files.
5444fcc15 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
026134d05 add method for get_zone_names
bf99ca29e Merge pull request #1988 from NREL/buildresschedfile_hpxml_class
6286e5750 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
b09b416f8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
ae3728468 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
1485a600f Address comments
c86737d61 Some final cleanup.
bec97607c Refactors the BuildResidentialScheduleFile measure to use the HPXML class rather than direct XML manipulation.
fb5914051 Update Changelog.md
b33da16ed Update docs/source/workflow_inputs.rst
c28cfcf24 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into detailed_zone_conditions
1669c1d6b Merge pull request #1986 from NREL/reduce_outputs
b303f5d4a first cut to add defrost EMS, only applied to default defrost models for now
2231f16ca I guess this is better.
4cc294d01 Avoid writing the E+ eplustbl.htm by default. Delete the eplusout*.msgpack files by default (run_simulation.rb only).
1a5834ac6 minor update to arg DisplayName and Description
e10588802 update docs
49a571d24 update util.rb to fix CI run-workflow
9a3eb84c1 fix CI run-unit-test
9ccd5d855 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec Latest results.
2aaa26b55 Eliminate minor diffs.
c26d351d2 Latest results.
b14485ca0 Latest results.
f464e1d2c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c08 Merge pull request #1984 from NREL/equipment_type
ec1754e79 Latest results.
36df0b51d First pass on separating design and actual (installed) airflow rates in the code.
eca9abb0d fix curve type
6b80019e5 update plr curves for var speed and simple models
4830903eb Typos.
3f3d99a57 Missed one docs update
ce9b7f05f Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d Latest results.
5420232ca Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb24 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5b Rename HPXML element for clarity.
b4d41409f Latest results.
f75906c6a Exclude pan heater if heat pump is only used for cooling.
26bbf1a12 Latest results.
5e33bfa95 Remove EER input from ASHP 1-speed sample files.
c7daa100b Misc cleanup and refactor.
994164d19 Merge branch 'master' into detailed_zone_conditions
0a99bb2c0 update workflows and run_simulation.rb
0193a79c0 update metadata files
968d2102d update unit test
2f03d3dd1 update other parts of measure
d437915f1 cleanup output variables
d32ed7249 remove print statement
3b9abd8ab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
7733fcf4e Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
9b2695e54 address comments
d3ae2006f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9c139ec8f Merge pull request #1981 from NREL/refactor_foundation_and_walls_top
80dbafd4a Merge pull request #1980 from NREL/preserve_cfm_per_ton
f86c292c9 Minor refactor to calculate the assumed foundation/walls top once up front and then use it everywhere, rather than calling a method to calculate it over and over from many different places.
b60d785c0 Update docs.
105e910af If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2 Update tests.
d822a9147 Bugfix.
00ae4b435 Latest results.
c915c0c15 more tests and docs changes
feb0257f2 fixmes and todos
460d37ca3 Latest results.
0b28ce5b3 Update GSHP tests for rated airflow.
83487b0fd Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36 Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
da825c16b Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
1aa9adc2b ghp unit tests
2a322f1d1 Latest results.
ef80cc14a remove 75% adjustment for advanced ghp models
eeb59b8ca Latest results.
775a55a9e update measures
bbeafed48 hvac sizing unit test
3d7f7f89b Latest results.
38bcadb64 unit test revert
54d5d24cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f5bb9349d Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
907f02ec4 revert the gshp test file efficiencies
0734e1f0a fix EMS vfr/mfr, set limits to fwf curves so it doesn't go below the data we have
0d9161236 Latest results.
acb4b24f4 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
7b2d4f625 update pump mfr ems
c060c49b4 Latest results.
14b54bfab A little cleanup of docs/changelog [ci skip]
e6cce37fc Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
16443106a update fplr curve for cooling as well
6ccb06362 Latest results.
bd7f7420d fix min_y, max_y
f40001d5b rename argument
155845f50 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
8301e024b Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
56ee01af2 update re-normalized fwf curves, add plffplr curves, temporarily remove var speed workaround
c0452c5dc Avoid this [ci skip]
afa98498e Merge pull request #1976 from NREL/udpate_sample_files
1c14c9912 Latest results.
48f448b26 Update sample files to remove SHRs (in preparation for the RESNET HVAC PR merge) and a couple minor other things.
ef4b73c53 Latest results.
5b7b3aa61 replace performance curves and assumptions based on waterfurnace data
6e5ed41ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
0730ba2ff Clean up FanPowerWattsPerCFM docs. [ci skip]
37c9886ca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
91b08bbb1 Merge pull request #1973 from NREL/timeseries-fix-freq-none
f065f58ae Merge pull request #1972 from NREL/docs_peak_timestep
d3ab90653 Update per review feedback. [ci skip]
a93237ca9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_peak_timestep
08168f182 Merge pull request #1974 from NREL/build_hpxml
9e953c00a Add template OSW and update docs for an example of just running the BuildResidentialHPXML measure to produce an HPXML.
6a992593a Set user output arguments to nil when timeseries frequency is none.
e02556d78 Add failing test with none frequency but output variables specified.
7b57873f1 Clarify peak outputs with respect to simulation timestep. [ci skip]
a3d7eb045 Latest results.
613c7e331 fix a typo
18d139673 Merge pull request #1964 from NREL/hvac_airflow
478bc0228 Latest results.
ff0ff823a Bugfix.
ed6141af4 Update Changelog.md [ci skip]
ed9b10459 Update tests.
95941d176 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
d8faacd1b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
128ad345f Latest results.
cd85ad75b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
915970713 Merge pull request #1968 from NREL/gross_shr
a4daad2e0 Latest results.
99a13f7a0 Latest results.
af0023a7c Address a couple FIXMEs
a3e59be53 Pass hpxml_header through.
634af4abb Remove SHR attribute from HPXML class.
f1d7d59bc Latest results.
c83c1a932 Merge branch 'master' into resstock
fded43345 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
0e19763bd fix ci failure?
9941f779c Merge pull request #1971 from NREL/attic_with_zero_pitch
5436d1c43 Latest results.
4217da26f Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
0d8e13d63 Use predicted load for pump mfr EMS to partially workaround the temperature errors
b567ac724 Fix CI test, minor cleanup.
5f512a316 Update expected test values.
4306e037a Update Changelog.md
56d23465f Fixes error if vented attic w/ zero pitch. Some code refactor.
34176f3a0 Latest results.
deb758b45 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
05282c16f update measures
dce75eecd fix unit issue in hvac sizing, draft pump mfr EMS(not passing yet)
aaee22915 Latest results.
2a608ecb2 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
08c871a7a pump power bugfix using coil speed level, speed ratio, part load ratio instead of unitary plr
e14dd0a55 using net shr for now
06d51516c Latest results.
a24e80971 Update docs and a little more cleanup.
a7811bae8 Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc Latest results.
b57b66bd9 Update HPXMLs.
de35c3976 Latest results.
df8cb2a97 Remove net SHR inputs, use hardcoded gross SHR.
e53340145 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
f9588c1e3 fix argument error
15f9e58cb Revert new airflow inputs for now.
6f5b011d9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be6577 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194df Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730b Merge pull request #1966 from NREL/rated_airflow
a350b9bb2 Merge pull request #1967 from NREL/ev_vacancy_periods
ed9ccfe6b Latest results.
4f59fb917 Update Changelog.md [ci skip]
62b06d46e iq test file using advanced for two speed system
132ff8c50 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
7338de988 first cut to add optional geothermal model type input
eb8432d96 Accommodate 40F cooling test.
c5b20a03b make whole house fans unavailable during vacancy periods
8fdc4add4 Latest results.
78002155d Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd86950 Update defrost test values due to changing gross COPS. A little more cleanup.
bd2f2fb0c Make EVs not available during vacant periods
bca9e9819 Latest results.
2bdea1d16 Simplify/cleanup code.
0344237cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed and small cleanup
6bc20525a Fix test.
8bf6468f6 Latest results.
cfe3af12f Bugfix for heating-only HPs.
ff3b02779 Rated cfm should be based on cooling per AHRI. Update tests.
894a79f44 Latest results.
c8d10f829 Handle systems w/ integrated heating.
e914fafe7 Bugfix.
44bc9c9b0 Initial progress.
3ea471aa0 Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8 Latest results.
067c066c7 Fix changelog [ci skip]
1a96466db Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8 Latest results.
93378846e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
7cf1ee0f2 Merge pull request #1963 from NREL/rubocop
829ec8fab Latest results.
366e88432 Some final cleanup. Moving on...
2783b00cd Switch to --autocorrect-all to preserve existing behavior.
59e67fe0d Shouldn't need these anymore, right?
f7c37d43e Enable all default-enabled Layout cops
293c916c8 Merge branch 'master' into resstock
6b8bd42a4 Use https://github.com/NREL/OpenStudio/pull/5384 [ci skip]
34d6f7bea Explicitly list out layout cops and add exclude
03ddf2f30 Set GSHP bore hole top depth. Temporary workaround for evap cooler issue. [ci skip]
63ba4d17f Update rubocop settings
cd146b650 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os1_10_0
f91dcda20 Initial progress.
125181330 Merge pull request #1961 from NREL/ev_charger_location
aef081c85 Minor cleanup.
5f5df09c2 Clarify doors w/ glazing. [ci skip]
062eb8998 Latest results.
d5de723c0 Remove EV charger location input
cbcd544e3 Latest results.
4a620d259 Bugfix for HP w/o heating.
795dc0ff9 Bugfix.
8199cc7c7 Bugfix.
82e8b1999 Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
d856eed9c Handle OutputTableMonthly objects, cleanup. [ci skip]
a00e66b64 Latest results.
ae5e0b84a Replace EV plug load with vehicle and charger for real home test file.
a6d53abce Merge branch 'master' into resstock
1b7843050 Use EV chargers for branch circuits and service feeders.
1dc1f4992 Merge pull request #1960 from NREL/slab_exposed_perimeter
a78490fee Merge pull request #1959 from NREL/solar_thermal_one
da0ecea24 Clarify slab exposed perimeter definition, add image.
12a257bb5 Fixes `SolarFraction` documentation/error-checking for solar thermal systems; must now be <= 0.99.
52f666926 Update ReportUtilityBills and meta_measure.rb [ci skip]
95ffa5987 Add default for induction range.
7b0b4e081 Enable reporting of detailed timeseries thermal zone conditions
77d743a31 Merge branch 'master' into resstock
a622ca85e Testing https://github.com/NREL/OpenStudio/pull/5367... not complete because Output:Table:Monthly is not wrapped.
cc43622b9 Latest results.
f4aa3f999 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
cf7afd9c2 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
a837c44d7 update varspeed performance curves, change pump control type to continuous for var speed system
38bcc7678 Merge pull request #1953 from NREL/fix_default_solar_screens_films
03b017023 Latest results.
5ee3d9797 Merge pull request #1954 from NREL/concurrent_ci
5f8b671ae Check ci skip. [ci skip]
efa5bc7e7 Add concurrency to stop previous CI job
625d3a37a Fixes default shading coefficients for window solar screens and solar film.
84d4e7245 Latest results.
40c2b1ef0 Update tests and docs after changing PowerRating to double greater than or equal to zero.
c08f1f0fd Update schema.
6d7262128 Latest results.
5fe5ca56a And another update around requiring power rating greater than zero.
d07b1b9e8 More updates around requiring power rating greater than zero.
c0c57cc04 Fix a test after the greater than zero change.
54c428904 Updates after changing to HeadroomSpaces.
9f5f6a2ae Updated schema.
0fba260cd Merge branch 'master' into resstock
6c6e2da79 Latest results.
d10efead5 Merge pull request #1952 from NREL/unknown_columns
7f10ef2c7 hers unit test
6244d97bf Tiny cleanup. [ci skip]
cdbc4ec85 Update changelog
ddc61f91e Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
c15161d54 remove exclusion of hvac sizing test for var speed system
c31144771 Let through unknown columns with warning
5fb94c5c8 Latest results.
80ef26ba8 one more test file with compressor type
8db955128 add var speed system
9fc96bf21 Latest results.
9d717ad0f add compressor type to one more gshp test file
e282f3716 revert making compressor type required in BuildHPXML,
77ef6e7f3 buildHPXML
fbf72b3d2 require compressortype inputs, fix unit tests, add docs and changelog
c8ef09453 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
fecc6950e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
d45b4f535 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea8711 Latest results.
8d2b48371 Merge branch 'master' into resstock
e66b367ac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
eadf702d7 Merge pull request #1950 from NREL/collapse_cluster_csvs
ffe847ae4 Assign compressor type in new real home file.
2607a2798 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into collapse_cluster_csvs
941a0596a For two speed, set water flow curves to constant 1.0 values
5073f9953 Merge branch 'master' into resstock
2c78f5dd1 Default well pump branch circuit to 240.
412b0b3a7 Merge pull request #1949 from NREL/require_compressor_type
c91ca160b Bugfix.
035dd6723 Cleanup.
fd83f4212 Combines CSVs for different clusters into a single CSV. Reduces the number of files by 75% and speeds things up a bit by reducing file I/O.
c1d6b4775 Require CompressorType for central and mini-split air conditioners and heat pumps.
879d74698 Latest results.
dfb7a92ac Remove unused code from tasks.rb.
c38d8c243 Add a real home test file.
8beea6be9 Missing doc for get_id method.
05243cd79 Merge branch 'ghp-two-speed-var-speed' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
0cf8e906e Some cleanup around ids.
35cce9ab5 change the ghp efficiencies
52aa25315 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
9ce8001c0 Merge branch 'master' into resstock
bc542bf8b Updates to ids and tests.
2550da71c Merge pull request #1947 from NREL/sink_schedule_bugfix
f7742cf6b Clean up measure.xml's [ci skip]
6438d9a18 Latest results.
6d18fd36a rubocop
44f366f82 Update tests
d9920df87 Add change log
0441e8e22 Apply rubocup
dc84767e9 Timing regression fix with modified algorithm
c8edd5b0f Schedule file changes
9f8a86767 Advanced diff
89c4dbedd Sink schedule bugfix
097ee2daa Merge branch 'master' into resstock
7ed5f11d8 Merge commit 'b5ad242' into resstock
2c17beb3a Merge pull request #1942 from NREL/schedule_shift_fix
af35dedfb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
49326b07b Rubocop
0aa1eeb2d Remove unused method
40f9335bc Update xmls
1df5aaf0d Apply rubocup and fix function signatures
5ee4d6009 Simplify weighted_random function
8d087caf3 Update warnings.
dde2d27a5 Optimize weighted random using precomputed values
e8ed2a21f Cleanup timing code and rotate in place
415e50fc2 Further optimize plugload/lighting schedule generation
da445108d Fix timing regression and add timing log
dc1e381a7 Update BuildResidentialScheduleFile/resources/schedules.rb
ffd8d4c2f Latest results.
5c4bf302d Latest results.
3fa52c09e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule_shift_fix
59473db84 Merge pull request #1944 from NREL/smooth_schedule_plugev
f1dac89c7 Update changelog [ci skip]
3addc293b Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
40d62899e Latest results.
53341ce9a Smooth schedule for plugload ev
65d036fa8 Latest results.
a57d4135a Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6f Bugfix. Update/simplify tests.
6ddda8203 Latest results.
f0da1c23f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7db Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
d422db54a Bug fix for print_diff when columns are added/removed
e69c24a88 Add some explanatory comments
eb490f75e Get rid of present occupants
86a8e52e1 Merge pull request #1943 from NREL/speedup_weather2
352a55c71 Fill function signature
79980b11d Merge branch 'master' into schedule_shift_fix
21cbc0525 Update changelog
a4d50985b Bugfix.
eead0e2c8 Latest results.
d4ebfee82 Fix other test
2f540b1ad Fix build residential schedule test
9c2db0ede Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into speedup_weather2
9dca9400f Merge pull request #1934 from NREL/bugfix_shared_combi_boiler
6f8aabc81 Fix zipcode formatting.
e01d301c6 Commit schedule file changes
42533a45d Simplify print_diff
222eae731 Reintroduces the WSF lookup, but much faster than the previous lookup. Turns out that our calculation is off for some TMY3 locations by 0.01, which is enough to fail a HERS test.
f3fdf3b38 Run python script using openstudio
d5c48421e Install pip
47282753d Update config
1fae02f4a Use exit codes
cac0703d9 Add diff printing script
4ecfa6880 Fix prand pertubation
2981dfcdc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bugfix_shared_combi_boiler
2c999caad Aggregation bug fix
e414e7855 Shift all schedules in sync and fix occupancy aggregation
fd722bba4 Merge pull request #1941 from NREL/speedup_weather
44ee77f51 Bugfix.
6d3f5d2ff Bugfix.
631cbf18e Accommodate multiple EPW files in the context of e.g. unit tests or tasks.rb tasks.
bcd539cc7 Bugfix.
cb0517782 Bugfixes.
446c77afb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into speedup_weather
3fd492106 Internally cache weather-processed data so that if the code is called from, e.g., different OpenStudio measures, we don't have to re-process the data. Also found a couple other opportunities to reduce processing related to weather.
659c434d7 Latest results.
9944a5507 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb Merge pull request #1932 from NREL/pan_heaters
e2c6d9597 Latest results.
2d21df678 Address review comments.
b00e40c3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bugfix_shared_combi_boiler
da40be9e5 Skip more warnings. [ci skip]
b7922d74d Temporary warning exception [ci skip]
8499a00f5 Update docs [ci skip]
2090b59ca Revert [ci skip]
287da47f5 Initial test of OS 1.10.0 [ci skip]
130e448fa Latest results.
00aa08d2d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
99e1de8c4 Latest results.
3c9734d8d A little code refactoring.
ba82c84e3 Expand tests to cover more outdoor temperatures.
5e4f0f67c Latest results.
76af612a4 Latest results.
fb6467e1c Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a94 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f983 Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222 Latest results.
f4ce9f047 Add sample files.
c13975e87 Merge pull request #1937 from NREL/compressor_type
86370e65a Latest results.
11ee9c8dc Bugfixes.
2a9c2b81c Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e Latest results.
5f82c2701 Relax schematron checks.
581cc7ac0 Bugfix.
33223fb12 Bugfix.
fa54726b4 Bugfixes, cleanup.
d63f1b614 Latest results.
eb1ba618f Fix tests. Move a couple methods to model.rb.
5c7420f9c Latest results.
13ab9a6ef Fix a couple tests.
9543b16d5 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee65 Revert order of measure args.
6b88c50e2 Add/update tests.
c596e2f7c Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb0 Latest results.
974ccbde6 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80a Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d4 Latest results.
c5b4f6279 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d03662 Latest results.
99e752e48 Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd7249 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783 Initial progress.
c4973ad6b Latest results.
d8e9e2ff5 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1 Latest results.
0679d2292 Small fixes.
0bd35e044 Fix CI error for WLHP simulations
c4378f1e8 Bugfix and update test.
1d95fa3b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a7 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from https://github.com/NREL/OpenStudio-HPXML/pull/1935.
6cd1de5ad Latest results.
d17ce3efb Latest results.
3658a9cc2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
eb0f4bbf3 BuildResidentialHPXML measure: Fixes error when specifying a combi boiler as the water heater type and a *shared* boiler as the heating system type.
640d7dc9d Add unit test and minor cleanup.
e2dd025d8 Bugfix for when there are no heating unavailable periods.
eaab75502 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672d Apply space heating unavailable periods.
bad50335c Latest results.
e9c8a7805 Add RTF to the calculation, revert unit multiplier.
74af33b01 Clarify defrost mode [ci skip]
f00d43dc2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbd Apply unit multiplier.
fea7655ae Bugfix.
6a3ce395b Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669b Fix new arg description.
e6c1e2d83 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc77 Latest results.
88747ff32 Just a little cleanup.
48354274e Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
624431565 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159 fix unit tests with nominal datapoints being optional
09de5d89c Latest results.
c1b85eccd fix test file fraction of nominal
c86c1f585 oops
820442e1d Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e98538621 relax requirements for nominal speed data points
73c8ff151 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126 EPvalidator.xml improvements
6b268d313 update measures
60679598c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c75 improve epvalidator for capacity consistency
f5e09fe98 Update expected values.
c0328e4ce Latest results.
2c65c7dc9 Latest results.
e00c9e9a9 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf91 More fix on the BuildResidential test
c3880879d Fix measure; not sure what happened before.
c47adc8fb Fix CI failure.
18b999542 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27 fix some ci errors
b52c0ca96 add unit test for default variable speed detailed performance data
2eed57d7e Latest results.
785774a7d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3 Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881 Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf Latest results.
d4092dbfd oops, specified the wrong capacities
5c17fccf8 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012 fix pthp hspf calculation
a0e3b2fbc more fixes, update measures
5329c9d36 bugfixes
0b219eb58 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2 revert 17F requirement, first cut to model 3 speeds
b65e5da5d fix bugs in current capacity17F and retention
5869e03e6 fix compressor type default using seer
f191e0beb fix a few issues to run test files
f7b74a396 Latest results.
ec12831b7 fix test validation
3f0b0e328 implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
b5ad242a6 Latest results.
070870617 Update rounding and count heating/cooling spaces only on heating.
36a76b035 Refactor how branch circuits connected to HVAC components are defaulted.
706672cb2 update measures
5d2d34e66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b57048fc1 More adjustments to breaker space defaults and tests.
30e47f31e Avoid writing branch circuits representing more than one branch circuit.
ad7c21ed1 Add circuits up to max spaces.
3824881c5 Latest results.
0e2ff5e0d Allow 0 occupied spaces.
718c5582c Change central air conditioner back to using 120v AHU.
b1393fd6b Fix tests.
e07cedea1 Few updates and improve tests.
e8379ff3b Latest results.
1a6510fff Add a 240v room ac test.
9173f0bb1 Update panel subcategories so we get output.
314d8ce51 Latest results.
d4f2c8760 Update regression equation and tests.
d3314c231 Exclude meter-based outputs from 10x comparisons.
7ea52e131 Update measure xml.
1a4197a26 Meter based calc types with whole building is unsuported.
302d4a8d0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
2dec1dfbc Add comprehensive configurations test.
7cabcbc9a iq ems
b9e34296a Merge pull request #1904 from NREL/datapoint_extrapolation
bb4024dca Update util for separate panel csv file.
59c299c48 Merge branch 'master' into electric_panel
4427a6652 Clean up and simplify default methods.
259226ac7 Latest results.
0f16d7ccd Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05 Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d Latest results.
1dfc3c60b Bugfix for situation where cooling input power is increasing at lower temperatures.
1010b16a2 fix sizing unit test
3f9323731 Latest results.
ab22fcc20 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
7ca65e3c2 Update the changelog. [ci skip]
e698b9be2 Bugfix and rename variables for clarity.
96f8a3626 Another pass on defaults and docs.
2d40a2c94 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
e194e2d03 Separate panel outputs section.
ee11d178b Latest results.
ab23aafd9 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
800a3e599 Code and docs cleanup.
5f5ae6698 Update measures, tests, and docs.
eaf11b678 Merge branch 'master' into electric_panel
f2412b27d Latest results.
2851dd1fb Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1 Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
ccd60fda4 Start updates for DemandLoad to ServiceFeeder name change.
a803ed687 Latest results.
e3badf5be Update test.
5848d907a Forgot to commit these changes too
03cd5f1f7 Disallow 60F heating/cooling datapoints and address additional review comments.
bff3e3bba Latest results.
0c158257d Fix footnotes in docs.
c9863421c Latest results.
03f284c2a Remove debug code
da7b493cc Fix adaptive step size method and address PR review comments.
3ae94ff48 More docs fixes.
ec8f33609 Fix typo and clean up docs.
d218b8a30 Allow demand load summaries without calculation types.
3b78dcf0e Fix reporting test.
6dbe3fbed Update docs and output load types.
9d84e6b48 Update schematron and validation tests.
40853ac30 Update electric panel and output report tests.
d6320f0c9 Update defaults test.
5634c0ab7 Small docs image improvement [ci skip]
ba5a075b0 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
edc273cc4 Merge branch 'master' into electric_panel
814cce146 Latest results.
4e7987252 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003 Latest results.
63204b7ca Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb53 update measure
061a46a0c fix max power program
e1b4e58a7 Split BranchCircuits and DemandLoads.
d1d0cc8ba oops, remove debugging statements
b1512e268 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
7facd8860 bugfixes, installation quality program(haven't finished yet)
89a16ffbb Merge branch 'master' into electric_panel
58e814290 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
ed642d891 Added temperature max/min values to curves, fixed airflow and water flow quadratic curves (fixed coefficients orders, and fixed some curves that are not normalized).
631fd33b1 Revert max compressor temp input.
c883e6221 bugfix
4615f89ab hvac sizing cleanups for two speed GSHP, added rated cop ratios at each speed
cba4f3107 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
9bc56b129 Add another panel sample file.
d01e7fff9 Fixes some CI failures.
fc63ba3e1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744 Latest results.
d67c410c1 simplify indoor temperature bounds
b2caf33a6 elsif instead of else
bb03af402 power calculation for ptac/pthp
b90c06613 Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33 Simplify implementation to remove step search [ci skip]
3ea004347 Perform extrapolation until values become negative.
11d271c06 Minor code cleanup.
143b37ec3 Simplify extrapolation bounds.
5a8c811d4 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d178 Add capacity & power datapoint checks.
5bdc5548e update calculate_fan_power_from_curve
f317c3636 simplify calculate_fan_power_from_curve and minor doc fix
46c13626f update EPvalidator.xml
85effef4b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a Latest results.
889667dff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2182a8f48 updated performance curves, capacity ratios, cfm/tons based on E+ rated conditions, added more inputs, a few questions, store progress
29708dfd1 Use uppercase letters for PSC/BPM, add full names in docs
8a5597585 Update comment [ci skip]
346d8c935 added performance curves for two speed gshp, more assumptions and inputs added.
fc157cf39 Latest results.
d1b6749aa Update Changelog.md
c36aa2f08 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9d First pass.
c18ed4fdb Small bugfix and cleanup.
6b2f3e86c Update default crankcase heater power.
0788320b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
b4beb83e4 Merge pull request #1902 from NREL/eer_defaults
7a1d22391 Latest results.
74696c4bf Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d Eliminate diffs
8fdffff23 Latest results.
f5d763a61 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7e Latest results.
2e79ad352 Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a3231905b Latest results.
3f618f8e3 Update new sample file.
15d9e32c0 Merge branch 'master' into electric_panel
944cea97c Add more comments and sample files.
523cea90c Include breaker spaces calculation in docs.
74e100c81 fix issues, add heating coil object
f41d4f1cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
8fe19e51d Renames the schematron file extension to .sch.
2bd038625 Latest results.
00db61d4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb fix unit tests
1a574b78d Merge pull request #1897 from NREL/eer_inputs
e759a59f5 Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
b31a629fa Merge branch 'master' into electric_panel
5230577ff Finish defaults warning for voltages not found in csv table.
04bc97323 Update default max current rating and headroom breaker spaces.
ac32c756f Latest results.
6c97afbd2 update measures
2d3dee308 remove use_eer, use_eer_cop variables, address comments
d9e50cb2d changed room ac/ ptac eer to ceer to follow similar logic, some rename
d7d505ea4 Add notes following the defaults table.
570a85bad Update a few issues around applying only to electric appliances.
f5de7a6ab Latest results.
4fa0b692b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432 Latest results.
f0c441fce Allow CI simulation results even when unit tests fail.
4c4b2bfee Fix approach, use placeholder.
96c7f41df A couple more comments [ci skip]
32d32c9eb Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95 Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d one more rename
7ffcbff6f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758d renamed fanmotortype, and started variable speed assumption update
8dd0c1072 Return zero breaker spaces if rating is zero.
c495f8980 Latest results.
01c53159f Latest results.
abb96630b added temperature bounds for indoor sensitivity
7a5f48abb Updated indoor sensitivity coefficients
fffb1943a Update default table, and throw warnings when corresponding rows are not specified.
1edbedd66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cf18f501 Update the docs. [ci skip]
7298441f7 Replace * with 120/240 in default table.
10460aba0 Merge branch 'master' into electric_panel
41c9ec96c Include breaker spaces defaults in csv file.
b2b450941 Reference default panel csv in docs.
c781b8157 Use default panel csv in defaulting.
36c3f0e78 Clean up default panel csv a bit.
f2f9135c7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80396f47b Fix tests after having slightly updated NEC calculations.
02ae94236 Respond to review comments.
fd69b3703 Merge branch 'master' into electric_panel
64732198d pulling electric panel nameplate capacity into a table
5ad97016a More HVAC tests, new dryer and mechvent tests.
4c381f944 Continue to build out HVAC configuration tests.
d3664bac3 Move HVAC and WH tests over to new test file.
ded06cfa6 Latest results.
ce441d3b9 Update reporting test for optional panel outputs.
fc556df27 Update defaults and tests.
169c1db19 Merge branch 'master' into electric_panel
6ddc1de78 More HVAC configurations to test.
2a7893e3d More refactoring and testing.
3cae1a8a0 Latest results.
6c0629b20 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ghp-two-speed-var-speed
9c9d5be99 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc491 update measures
f05a5bfb0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b046246a7 Update test files.
94c7f3cf7 Support multiple panel calculation types.
b34e9c686 Update inputs and outputs docs for panel calculation types.
39bbb66a4 Move non direct expansion input capacity method to hvac resource file.
eb5b8e182 Report only panel calculation types requested.
466784434 Move output to separate file, and make panel default opt-in.
c2c484dba Latest results.
ac9c0e19d temporarily reverted indoor sensibility change
bf5d323ab update_measures
554f49ad1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd8 Latest results.
b40b1e6c7 one more fix
4eadfc22d Latest results.
a7d4806c5 fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
0118d52c6 Temporarily use either rated or seasonal COP.
2c066d465 Assume ventless clothes dryer means heat pump.
01651b278 Try dividing by rated COP for dx.
54e3ad728 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2e667ce3 Latest results.
6d76d8b5b Update reporting test for extra breaker spaces outputs.
cf7570530 Merge branch 'master' into electric_panel
7d2537882 Remove workaround for pump w.
bacd60a79 Merge branch 'master' into electric_panel
43950bca0 Report breaker spaces by load type for debugging.
195418408 Stub more exhaustive hvac and wh configuration tests.
3aa18aeea Methods for hpwh cop, blower fan watts, and pump watts.
2c701cda5 Move a…
joseph-robertson added a commit to NREL/resstock that referenced this pull request Jul 7, 2025
@joseph-robertson
Squashed 'resources/hpxml-measures/' changes from fe4e28afbdf76..d197…
bb346fe 
…cf859ab17

d197cf859ab17 Merge pull request #2037 from NREL/hvac_docs_cleanup
70790b7e56e49 Latest results.
8246e89d515b8 A little documentation cleanup. Move HeatingCapacity17F and extension/HeatingCapacityFraction17F onto the same line. Clarify default for AutosizingLimit inputs. Clarify temperature for nominal cooling capacities.
c947c4d84b9b9 Document HVAC season default [ci skip]
ff0e7c541b720 Merge pull request #2035 from NREL/hpxml_version
22a0f058851c8 Latest results.
48921acd63c06 Bump version to 1.11 and pull in HPXML v4.2-rc3.
ec7affe82d0b2 Minor changelog cleanup [ci skip]
baaa57c5b692e MINHERS -> HERS
d15c98cd8621b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
ec6d0c33b0046 Update a couple comments [ci skip]
0017c6dacbe09 Merge pull request #2034 from NREL/hers_hvac_tests
ac0cac01806ca Just leave it.
c89327ce205ef Address FIXMEs
438c2f2b06f1b Re-enable HERS HVAC tests.
d934b003e4079 Merge pull request #2032 from NREL/eri_latest
03be9f03826de Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into eri_latest
26c7f39e6edbf Merge pull request #2033 from NREL/hvac_interp_bug
3486e9f16abda Latest results.
ae87f509bdc66 Fixes possible interpolation bug when calculating min speed values for two/variable speed systems.
3bb5c80f6e932 Latest results.
c30cb54232a33 Sync with NREL/OpenStudio-ERI#779
87cc1839ba1d6 Merge pull request #2030 from NREL/default_infil_height_and_volume
54ee52810539c Latest results.
9d5949b94d963 Merge branch 'default_infil_height_and_volume' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
420b3d79898e9 Fix average ceiling height in cathedral ceiling sample file, update tests.
5198e5d96ec3c Latest results.
6c0465c0a0a34 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
56d89fb01664e Merge pull request #1879 from NREL/resnet_heat_pump
fd488dce6ac73 Merge pull request #2016 from NREL/hvac_docs
732210fd1cb96 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
f69c65f551683 Merge pull request #2015 from NREL/resnet_defrost_model_type
f6ee9bebd0ae6 Latest results.
2663478c8842a Minor cleanup.
64119ebbe774d Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
27f86c2fe6f18 Latest results.
a0eb8a12c5c4f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
eaa4b32edb543 Remove debug
d164eaba1666d A few more tests.
99ab08d3a710d Merge branch 'default_infil_height_and_volume' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
7ead4164736fa Minor docs update [ci skip]
e62e94e05370f Latest results.
1b9efc2460fa8 Update EPvalidator.sch
bffac06787e1e Include assumed rim joist height between stories.
573f185438a7c Improve docs [ci skip]
6cf473dd9a26b Bugfix.
d709ac6ecf3d0 Latest results.
fe27922cce1df Update docs/changelog [ci skip]
af2203a640164 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into default_infil_height_and_volume
a484a7348f8a2 Merge pull request #2028 from NREL/clothes_dryer_drying_method
15c2d855c1a34 Latest results.
ba6a26ff5f40d Update tests.
39d0823386e51 First pass on updating default infiltration height/volume calculations.
d9253688bb7cd Latest results.
5ff66cfc66867 Latest results.
c3439adabf1fa Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
9dc0cd065a9c7 First pass on new ClothesDryer/DryingMethod input.
c5fd8cbe5ab48 Latest results.
c4a570f3127d7 Update new test.
e23ac5b3582c8 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
1b19b1b5f9046 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a0f46171e12b8 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
de99f9534d447 Latest results.
214a357fa403e Address FIXMEs.
bd251ee5a3a20 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
7d0542d9ec82a Merge pull request #2026 from NREL/Branch_resnet_heat_pump_conflict
f86d5e03ee44a Latest results.
71bfbde203311 Relax 10x tolerance for duct component loads
e6993eea0fd60 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Branch_resnet_heat_pump_conflict
d0c90f5436c77 resolve conflicts on pulling latest master
d20eaf3cd63a4 adding unit tests for fan cfm, power, and c_d
c743c1f9575dc Latest results.
67cdef170180c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
fb24af465a49d Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
85a85befc72ad Update GSHP tests.
796696fba08b5 Latest results.
6ca392a65d204 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c4f66e7233439 Simplify fan motor type defaulting to use compressor type for all HVAC types.
5a2d6f4aaaee5 small cleanup on defrost unit test
92cec5c717270 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
a4e0af94ddd9e Latest results.
6e264b3835b1d Update test due to new error check on fan motor type.
a8f23e0b8ecc8 Add sample file for fan motor type.
a9d4ad242dc54 Change DFHP min compressor temperature default from 25F to 40F.
861e6071cd7a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2779cfecf89d1 Merge pull request #1987 from NREL/resnet_defrost
f28f2c1db5a54 shift backup defrost energy by one timestep due to the EMS lag
aa6c69d0e76f3 Latest results.
6e2899c4bf8a9 minor ruby doc update
b4c59d510b6af combine pan heater and defrost ems program
acd4fb12ee681 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
cb4dde224f0cb Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c5b0b9efb292e unit test for delivered heating loads
fa21822d5c593 Latest results.
967274f0e7081 Latest results.
42ce5fc9ed803 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b0ae430bd759c docs and changelog
01db50f39ec50 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9e0ba8f5f36d9 Update new electric panel heating/cooling expected values due to design airflow cfm changes.
af196c1d16a89 Latest results.
423923293f9e2 update hpxmls
c667c28dd84e3 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
8043033fe89f5 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
1e09cdc6621cf fix unit tests
7c18d97d73cc8 Latest results.
619edead958f8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
aec26f4fda48b use objecttype instead of names
b8c08bc2de718 fixed unit multiplier cases not adding sensors to total loads program
a6bca8b578ef8 address delivered heating
8d68c5505d10f Update test, take 2
a4be5f2bfc4ba Update test.
617ae4dd89aa3 Misc cleanup: Move meter methods to model.rb. Switch defrost backup error to warning. Prevent E+ defrost warning.
5eb1c9c0ba8dc Bugfix.
1f583ec2d413a Bugfix.
8e48db9929016 Merge branch 'resnet_defrost_model_type' of https://github.com/NREL/OpenStudio-HPXML into hvac_docs
b0e842902daa1 Completed pass. Moved some code from hvac.rb to defaults.rb.
f552ac2555f24 Latest results.
e7accddfb7222 Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_model_type
f365f40f7fdc0 Latest results.
acff77f642a64 Some more progress [ci skip]
0f8784fc65a9b Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
a403eeb00628f Revert custom meter reporting for delivered heating
14dbbc9862f93 Initial pass on fully documenting hvac.rb plus a little code refactoring/cleanup. A bit more to do still.
c3a388afc84be Clean up Changelog.md [ci skip]
0cb3dabb74eb7 Update URL
0e2288667d931 Remove DefrostModelType and advanced model type; now using RESNET model for everything going forward.
99619831ba381 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af0705fb66999 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4a9e7c7a4d264 fix reporting issue using custom meter, small refactors
dedf3ac7e1315 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
9b767aee82e98 Merge pull request #2010 from NREL/resnet_defrost_without_backup_heat
f3ddfcb34eb5e Latest results.
a8d9fb2824db2 Remove unnecessary file, add error check and test.
84d69c5820691 Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
38f8aab338edc Update comments [ci skip]
ac1db586a807b Latest results.
74daba0f379cb Update default based on ducted vs ductless.
e256d60d168ba Update Changelog.md [ci skip]
7bdb234639541 Improve warning thresholds for newer metrics.
12c7d9eac43d8 Latest results.
0124dd08de88a Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
caf26719f0e76 Latest results.
5a17797416bed Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
366e9c460a1ca Latest results.
45c0077dd8518 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
0757c12306db1 Latest results.
5a6e4872f811d Merge branch 'resnet_defrost' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
b8d12ea588073 forgot to change the argument order while refactoring unit tests
04ec8e55ce2bb Latest results.
a89953c8dd051 separate backup system not operate during defrost, add load actuator if supp capacity is not enough to offset cooling, change resnet f_def calculation, add unit tests
cd5dabf8f987b Latest results.
19d26fe196fce Merge branch 'resnet_defrost_without_backup_heat' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost_without_backup_heat
b34875db9f101 Update test.
653d390f89ff6 Latest results.
6bac58757d23d First pass on new input to support OS-ERI, where we want to model HPs that don't have backup heat as having backup heat (to prevent unmet hours) but not backup heat active during defrost.
209b2313ce9ae Latest results.
784c9afe57601 Latest results.
e1ca0f1c92dcb Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
af7648f0c3cfa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cd100227644d Use lowercase for argument
b04a3e9479805 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
ee353198131cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
9431044a35062 Latest results.
3a154d127f268 temporarily removed some EMS check due to refactoring for advanced defrost model
70c37ad045aa8 Latest results.
e06a624a97921 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
c4a12be3ca5a1 Latest results.
8b887f9730f80 Update test values
bbdfc1fc3b0b2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e77d7c841eab5 apply the reporting fix to advanced defrost models too.
78b25bcf02952 fix reporting, using Jon proposed equations to calculate supp heat
8585bcaabe6bd Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
6d553c80f6050 fix ci
dd92aa7fd8dff Update a couple tests
849ce966d923d Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
42d94e3cee726 Latest results.
e2edb2445000d Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5762be77e3ca0 Merge pull request #2001 from NREL/master_resnet_heat_pump_conflicts
fa9bc9f40ca3a Merge branch 'os1_10_0' of https://github.com/NREL/OpenStudio-HPXML into resnet_defrost
0fd511281bf47 Tiny cleanup [ci skip]
cec4f8b937701 use iq curve coefficients
c7cdffaca83da address comments
310e20b475913 Latest results.
2c96bc1bcf0ea Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
8bcc9f0a0ae6d Merge pull request #2000 from NREL/resnet_heat_pump_ci
5c8d92b2a2218 Latest results.
873103a6a29d7 Fix CI test.
f6d74adff6d3a update measures
8b9d546d62ba6 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
5cbc80ddd5272 further conflicts to resolve
e111136b6ada8 Trigger CI
0d52404bad192 Fix heating vs cooling coefficients in HVAC installation quality EMS program. Remove get_charge_fault methods and set upfront in defaults.rb.
78dc1fa7a91c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into master_resnet_heat_pump_conflicts
32703c9661078 Latest results.
2a34ac36bc625 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5444fcc1588c6 Improve test based on @yzhou601's suggestion. Now using allow_increased_fixed_capacities = true.
b303f5d4ac52b first cut to add defrost EMS, only applied to default defrost models for now
9ccd5d8559090 Merge pull request #1985 from NREL/actual_vs_design_airflow
4a5a69eec9604 Latest results.
2aaa26b55719b Eliminate minor diffs.
c26d351d2d4e8 Latest results.
f464e1d2cea00 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into actual_vs_design_airflow
cd7a80c08976f Merge pull request #1984 from NREL/equipment_type
ec1754e792b39 Latest results.
36df0b51dfe5f First pass on separating design and actual (installed) airflow rates in the code.
4830903eb48ef Typos.
3f3d99a57d0ee Missed one docs update
ce9b7f05f469f Allows optional `extension/EquipmentType` inputs for central air conditioners and heat pumps; only used for SEER/SEER2, EER/EER2, and HSPF/HSPF2 conversions.
4fd5dc74d3775 Latest results.
5420232ca9eec Improve whether crankcase is allocated to heating or cooling end use for HPs that only provide heating or cooling.
9b2abeb24840c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f32d7cf5bbbc7 Rename HPXML element for clarity.
b4d41409ff468 Latest results.
f75906c6abf48 Exclude pan heater if heat pump is only used for cooling.
26bbf1a127220 Latest results.
5e33bfa952d46 Remove EER input from ASHP 1-speed sample files.
c7daa100b223f Misc cleanup and refactor.
d3ae2006f6b37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
80dbafd4a19db Merge pull request #1980 from NREL/preserve_cfm_per_ton
b60d785c08a08 Update docs.
105e910af5c95 If only heating (or cooling) airflow provided for HPs, preserve the cfm/ton for the other mode.
d5592b97f75db Merge pull request #1979 from NREL/design_airflow_cfm_input
cee29e8b2a7b2 Update tests.
d822a91479bb3 Bugfix.
460d37ca3fabd Latest results.
0b28ce5b32cab Update GSHP tests for rated airflow.
83487b0fdafb7 Fix GSHP rated airflow rate, use calc_rated_airflow() more places.
92d0fab36bb7d Allows optional `extension/HeatingAirflowCFM` (and `CoolingAirflowCFM`) inputs to specify design airflow rates.
3d7f7f89b9a49 Latest results.
54d5d24cd73fd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
14b54bfab031f A little cleanup of docs/changelog [ci skip]
37c9886ca8592 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
18d1396731509 Merge pull request #1964 from NREL/hvac_airflow
478bc0228570b Latest results.
ff0ff823ac8c1 Bugfix.
ed6141af4bda0 Update Changelog.md [ci skip]
ed9b104594775 Update tests.
95941d17691ca Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
128ad345f1d1a Latest results.
cd85ad75b7f2f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
91597071374de Merge pull request #1968 from NREL/gross_shr
a4daad2e06390 Latest results.
af0023a7cb6fa Address a couple FIXMEs
634af4abbd889 Remove SHR attribute from HPXML class.
06d51516cc40a Latest results.
a24e8097196f9 Update docs and a little more cleanup.
a7811bae8cc68 Retain gross SHRs for RoomACs/PTACs/etc. A little more cleanup.
8ebe98dfc822f Latest results.
b57b66bd92aa0 Update HPXMLs.
df8cb2a970b72 Remove net SHR inputs, use hardcoded gross SHR.
15f9e58cbad2f Revert new airflow inputs for now.
6f5b011d9c89c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
802be65774263 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d2f5194dfc0ab Merge pull request #1936 from NREL/one_and_two_speed_hvac
9f3a7730be235 Merge pull request #1966 from NREL/rated_airflow
ed9ccfe6bb49e Latest results.
eb8432d963cc1 Accommodate 40F cooling test.
8fdc4add43e11 Latest results.
78002155d3358 Merge branch 'rated_airflow' of https://github.com/NREL/OpenStudio-HPXML into rated_airflow
5efd869509c0e Update defrost test values due to changing gross COPS. A little more cleanup.
bca9e9819b785 Latest results.
2bdea1d161d5e Simplify/cleanup code.
6bc20525a8549 Fix test.
8bf6468f65b5e Latest results.
cfe3af12f1b90 Bugfix for heating-only HPs.
ff3b02779924a Rated cfm should be based on cooling per AHRI. Update tests.
894a79f446ac9 Latest results.
c8d10f829e2e8 Handle systems w/ integrated heating.
e914fafe71667 Bugfix.
44bc9c9b04605 Initial progress.
3ea471aa0750d Update sample files and docs, add GSHPs. [ci skip]
da9e1f3cd99da Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
4ffb445a8b4e0 Latest results.
067c066c73176 Fix changelog [ci skip]
1a96466db378f Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into hvac_airflow
afd8540cb925b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
637beb5c8dcab Latest results.
93378846ea997 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f91dcda2004c0 Initial progress.
cbcd544e3453f Latest results.
4a620d259020d Bugfix for HP w/o heating.
795dc0ff90fd8 Bugfix.
8199cc7c70fad Bugfix.
82e8b1999f444 Add default LCT datapoints. Expand tests. Rename BuildResidentialHPXML compressor type inputs.
9fc96bf219fb4 Latest results.
d45b4f5356728 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
597ea871196e2 Latest results.
e66b367acac93 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5c4bf302d8380 Latest results.
3addc293b32be Deep clean to reorganize the code and untangle spaghetti. This kept growing in size as I found more opportunities to improve/simplify the code. The main changes are: 1) moving more code to defaults.rb, 2) putting RESNET MINHERS assumptions all in one place rather than scattered throughout, 3) calculating/storing default assumptions up front so we don't need to call out to HVAC methods from all over the place, 4) Replacing speed-based arrays with single values where values no longer differ by speed.
65d036fa8cb2b Latest results.
a57d4135ae785 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
0fb796e6fa505 Bugfix. Update/simplify tests.
6ddda8203522f Latest results.
f0da1c23f4889 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b33c9d7dbdb9e Update capacity/EIR=f(fflow) curves. Simplify/cleanup code a bit. Update to the latest RESNET values and update tests.
659c434d728b8 Latest results.
9944a5507f2a6 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
36950fefb08e2 Merge pull request #1932 from NREL/pan_heaters
e2c6d95972988 Latest results.
2d21df6783eea Address review comments.
99e1de8c4c476 Latest results.
3c9734d8dad5f A little code refactoring.
ba82c84e37408 Expand tests to cover more outdoor temperatures.
5e4f0f67cd44e Latest results.
76af612a41659 Latest results.
fb6467e1c0ec3 Fix EER vs SEER check; EER2 vs SEER2 check is good.
dfec28a940742 Merge branch 'one_and_two_speed_hvac' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
74410f983757b Remove old error-checking code. It's now more complicated and not worth updating, let's just rely on downstream validation.
007a42222c457 Latest results.
f4ce9f047da56 Add sample files.
c13975e87a548 Merge pull request #1937 from NREL/compressor_type
86370e65acbad Latest results.
11ee9c8dce8bf Bugfixes.
2a9c2b81c5d57 Require `CompressorType` for central and mini-split air conditioners and heat pumps.
ec7e6402e25e5 Latest results.
5f82c270167a4 Relax schematron checks.
581cc7ac02f93 Bugfix.
33223fb125f76 Bugfix.
fa54726b42554 Bugfixes, cleanup.
d63f1b6148aa6 Latest results.
eb1ba618f212d Fix tests. Move a couple methods to model.rb.
5c7420f9cd881 Latest results.
13ab9a6efb3e9 Fix a couple tests.
9543b16d584a2 Move datapoint error-checking to schematron. More logic for 1- and 2-speed systems.
6418aee650fd9 Revert order of measure args.
6b88c50e2aa9c Add/update tests.
c596e2f7c17c4 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
c7ecf4cb0688b Latest results.
974ccbde62c40 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
d91fac80aa62b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
db75216d49b97 Latest results.
c5b4f62790d71 Set rated cfm/ton to 400. (Code will be simplified in a subsequent PR.)
097d036622083 Latest results.
99e752e48ed29 Fix interpolation bug, values now match RESNET spreadsheet.
5c0bd72499d41 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into one_and_two_speed_hvac
458e84783ffe7 Initial progress.
c4973ad6be8d7 Latest results.
d8e9e2ff56111 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
4a96b38f1e3fb Latest results.
0679d22925962 Small fixes.
0bd35e04411fd Fix CI error for WLHP simulations
c4378f1e89c7d Bugfix and update test.
1d95fa3b7f29d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
55583b1a79e30 Update documentation/changelog to reflect current use of detailed performance datapoints. Add error-checking for A) nominal datapoint capacities/powers and B) EER/EER2. Pull in latest NEEP products from NREL/OpenStudio-HPXML#1935.
6cd1de5ad6f4b Latest results.
3658a9cc27555 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
640d7dc9de382 Add unit test and minor cleanup.
e2dd025d8a480 Bugfix for when there are no heating unavailable periods.
eaab755028136 Merge branch 'pan_heaters' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
302cb672df68c Apply space heating unavailable periods.
bad50335c6bfd Latest results.
e9c8a78050705 Add RTF to the calculation, revert unit multiplier.
74af33b0129fd Clarify defrost mode [ci skip]
f00d43dc22e5b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into pan_heaters
96c923cbdacd2 Apply unit multiplier.
fea7655aef79d Bugfix.
6a3ce395b305e Merge pull request #1931 from NREL/heating_capacity_fraction_17F
21c61669bbe8d Fix new arg description.
e6c1e2d834da0 Allows optional pan heater inputs (`PanHeaterPowerWatts` and `PanHeaterControlType`) for central heat pumps and mini-splits; defaults to assuming a pan heater is present.
30ac6bc777de2 Latest results.
88747ff32601d Just a little cleanup.
48354274e1865 Replaces `HeatingCapacityRetention[Fraction | Temperature]` with `HeatingCapacityFraction17F`.
624431565198c Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6aac7c159b6ed fix unit tests with nominal datapoints being optional
09de5d89c058c Latest results.
c1b85eccd5d57 fix test file fraction of nominal
c86c1f585e9bc oops
820442e1d1139 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
e9853862100dc relax requirements for nominal speed data points
73c8ff151a770 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4b1ce4126e5d6 EPvalidator.xml improvements
6b268d3137e27 update measures
60679598cd31e Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4ccf04c75158a improve epvalidator for capacity consistency
f5e09fe989c65 Update expected values.
c0328e4cebd44 Latest results.
2c65c7dc9d2c5 Latest results.
e00c9e9a98049 Use capacity rounding consistent with what hvac_sizing.rb does
849bebf917da7 More fix on the BuildResidential test
c3880879d312f Fix measure; not sure what happened before.
c47adc8fbcda8 Fix CI failure.
18b999542b116 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
5553bdd27fa13 fix some ci errors
b52c0ca96cfc9 add unit test for default variable speed detailed performance data
2eed57d7e291d Latest results.
785774a7d60b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2160a12cd4c1d Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
4fdf904a16bfa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump fix hvac and default unit tests
9a0de11e8f712 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
6d92d56f3a52a Rename data_array to datapoints_by_stage, convert to hash. And a bit of additional code cleanup.
b2d548881a2c6 Update docs/changelog for where we are heading. [ci skip]
af5e4fdcf877d Latest results.
d4092dbfd6c47 oops, specified the wrong capacities
5c17fccf83a91 remove requirement of heating/cooling capacity for detailed performance data
8cd88d012b1f5 fix pthp hspf calculation
a0e3b2fbc5138 more fixes, update measures
5329c9d3681f9 bugfixes
0b219eb58cea3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
d42a771b2d15a revert 17F requirement, first cut to model 3 speeds
b65e5da5de03d fix bugs in current capacity17F and retention
5869e03e6c832 fix compressor type default using seer
f191e0beb1e65 fix a few issues to run test files
3f0b0e3281a1f implemented most default assumptions into OS-HPXML, still needs to resolve the capacity retention.
706672cb2a07c update measures
5d2d34e6633ef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
b9e34296aa38b Merge pull request #1904 from NREL/datapoint_extrapolation
259226ac7ede9 Latest results.
0f16d7ccd9352 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
0ea97fd05a9e5 Using a more conservative min ODB temperature for cooling performance extrapolation. Didn't see any impact on runtime.
00efee59d1147 Latest results.
1dfc3c60b12f5 Bugfix for situation where cooling input power is increasing at lower temperatures.
3f93237318573 Latest results.
e698b9be2e042 Bugfix and rename variables for clarity.
2d40a2c948166 Implement 50% RESNET rule for min cooling ODB extrapolation. Code cleanup and consolidation.
ab23aafd9c3c1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
df1499e49adf3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2412b27d2c56 Latest results.
2851dd1fbaf96 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
bb1638be1de2f Double tolerance to reduce number of datapoints by 2x with minimal impact on results.
a803ed687ae9c Latest results.
e3badf5be1d51 Update test.
5848d907aba41 Forgot to commit these changes too
03cd5f1f70ab0 Disallow 60F heating/cooling datapoints and address additional review comments.
c9863421c5ce3 Latest results.
03f284c2aa534 Remove debug code
da7b493ccd03b Fix adaptive step size method and address PR review comments.
5634c0ab76ccb Small docs image improvement [ci skip]
ba5a075b0bd67 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
814cce146e0e4 Latest results.
4e7987252605c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
472708003a1dc Latest results.
63204b7ca5fe9 Merge branch 'datapoint_extrapolation' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
f3738bb5371d7 update measure
061a46a0c4374 fix max power program
631fd33b13d03 Revert max compressor temp input.
d01e7fff9b649 Fixes some CI failures.
fc63ba3e18bc5 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
63bff2744bf22 Latest results.
d67c410c188f6 simplify indoor temperature bounds
b2caf33a6a792 elsif instead of else
bb03af4021528 power calculation for ptac/pthp
b90c06613b5b7 Restrict outdoor temperatures for detailed datapoints so we can apply the RESNET MINHERS Addendum 82 extrapolation rules. [ci skip]
f865e5c33a0db Simplify implementation to remove step search [ci skip]
3ea0043476ad3 Perform extrapolation until values become negative.
11d271c06c4dd Minor code cleanup.
143b37ec3b01a Simplify extrapolation bounds.
5a8c811d4336f Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
80776d178811e Add capacity & power datapoint checks.
5bdc5548e4ea5 update calculate_fan_power_from_curve
f317c3636f042 simplify calculate_fan_power_from_curve and minor doc fix
46c13626f438b update EPvalidator.xml
85effef4b230b Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
26b721a5a617c Latest results.
889667dff8f08 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
29708dfd1e6c8 Use uppercase letters for PSC/BPM, add full names in docs
8a5597585dedd Update comment [ci skip]
fc157cf39a1d7 Latest results.
d1b6749aa7cb9 Update Changelog.md
c36aa2f0853d1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into datapoint_extrapolation
3a1c29b9dcaf5 First pass.
c18ed4fdba8f9 Small bugfix and cleanup.
6b2f3e86c4a8d Update default crankcase heater power.
b4beb83e44ad8 Merge pull request #1902 from NREL/eer_defaults
7a1d2239145b2 Latest results.
74696c4bfcefb Merge branch 'eer_defaults' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
e067c097d8117 Eliminate diffs
8fdffff23b2fb Latest results.
f5d763a6127b8 Remove EER defaulting from defaults.rb, update tests in test_defaults.rb.
d96cf24b2e050 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_defaults
de85bbb7ede0f Latest results.
2e79ad352ca1f Add EER2 defaults based on regression of ENERGY STAR products.
9fa94f37e5da4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2bd0386252daf Latest results.
00db61d4bd99a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
17f9051eb31ff fix unit tests
1a574b78d77a9 Merge pull request #1897 from NREL/eer_inputs
e759a59f5ab9a Create is_room_dx_hvac_system method to centralize logic, and other misc cleanup. No diffs expected.
ac32c756f6591 Latest results.
6c97afbd21ee1 update measures
2d3dee308b031 remove use_eer, use_eer_cop variables, address comments
d9e50cb2d8333 changed room ac/ ptac eer to ceer to follow similar logic, some rename
f5de7a6ab48d5 Latest results.
4fa0b692b0ab1 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
0ad8ce432a705 Latest results.
f0c441fce26a3 Allow CI simulation results even when unit tests fail.
4c4b2bfeecafc Fix approach, use placeholder.
96c7f41df8395 A couple more comments [ci skip]
32d32c9eb0f35 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into eer_inputs
f0fe87e95ddeb Allows optional EER or EER2 inputs for central air conditioners/heat pumps and mini-splits.
ab5d5eb2d5f6d one more rename
7ffcbff6f2123 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f1e8a758da9ba renamed fanmotortype, and started variable speed assumption update
c495f898090ab Latest results.
01c53159f0733 Latest results.
abb96630b8d9a added temperature bounds for indoor sensitivity
7a5f48abb3f7f Updated indoor sensitivity coefficients
1edbedd66b473 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
f2f9135c716f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
3cae1a8a0129d Latest results.
9c9d5be994e69 Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
a322dc4911d4b update measures
f05a5bfb05318 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
c2c484dba651f Latest results.
ac9c0e19dc9e7 temporarily reverted indoor sensibility change
bf5d323ab17ea update_measures
554f49ad1a7a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
22af55b7b78ea Merge branch 'resnet_heat_pump' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
2d1fb0c1b0535 revert measured w/cfm defaults, updated rated fan power default, docs, etc.
06c27afd831c0 Latest results.
b40b1e6c7c6dc one more fix
a7d4806c5970f fix tests, changed defrost fan power cubic calculation to follow the same resnet updates, remove in.schedules.csv in test_hvac.rb
54e3ad7283cc2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet_heat_pump
bee0df1bcb3e9 update measures
7e5af4926070d updated fan watts per cfm default, added fan model type

git-subtree-dir: resources/hpxml-measures
git-subtree-split: d197cf859ab1777907a002b315c44426df117491
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@shorowit shorowit

Labels

None yet

Projects

OpenStudio-HPXML
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@shorowit