Skip to content
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.

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

Latest OS-HPXML #1006

Merged
merged 9 commits into from
Nov 16, 2022
Merged

Latest OS-HPXML #1006

merged 9 commits into from
Nov 16, 2022

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Nov 14, 2022

Pull Request Description

Pulls in:

Checklist

Not all may apply:

  • Tests (and test files) have been updated
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected regression test changes on CI (checked comparison artifacts)

…91003

a5531291003 Merge pull request #1221 from NREL/speed_up_has_fuel
2e69f46cf6c Update ReportUtilityBills tests.
1e97e67927b Improve runtime performance around use HPXML::has_fuel.
2ffd554d938 Merge pull request #1163 from NREL/allow_additional_floor_type
c543072db48 Latest results.
48b1e7a64b3 Update test.
8ce103f3671 Make methods more consistent. Update tests.
db1d2ee39a2 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2fa56eb6659 Rename previous FloorTypeFoo constants to FloorOrCeilingFoo.
1ccda9f86e3 Latest results.
b13eb2df9f3 Add base-enclosure-floortypes.xml and tests for full coverage. Fix double-counting of interior finish/floor covering material for SIP/concrete floors.
25aa32b7201 Only assume osb for floors, not ceilings. Some code cleanup/simplification.
b1f2ccc8f35 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
49a07e71dad Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
50158fa9b18 Merge pull request #1220 from NREL/seer2_hspf2
b5f8fc48a8e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into seer2_hspf2
be46c200e80 Merge pull request #1218 from NREL/address_fuel_warnings
0669947f293 Fix typo [ci skip]
b6b59d32a4e Updated SEER2 & HSPF2 conversion factors.
a265b7768c7 Latest results.
172518c47bc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into address_fuel_warnings
5d6a3db0fc6 Fix test.
196e35624bb Merge pull request #1219 from NREL/os350final
fd3b1aebab1 Fix CI error.
91fd2f5091c Add tests for floors and ceilings
a5428d7c73c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into address_fuel_warnings
3344a3cf8b5 Add more info to error messages.
bc211d554bd Replace FloorTypeSteelStud with FloorTypeSteelFrame
78b42549ef7 Update config.yml
ca7278c6626 Merge pull request #1217 from NREL/battery_lifetime_docs
c84f245682b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
fe6f9e7863a Closes #1210.
90c4c3eb019 Merge pull request #1216 from NREL/changes_for_eri
afe7e5c4220 Run update_measures
a3f70a239eb Run update_hpxmls
7b9982516d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
af8a149ebf7 Use a single floor_ceiling method for all floor types
741a85f2f26 Update base-enclosure-floortypes.xml
c93afa77b34 Better document the battery lifetime model input. [ci skip]
bbce42c25a9 Backport.
69dba289119 Revert "Separate "apply" methods for sip or concrete floors and ceilings"
179effe439c Merge pull request #983 from NREL/window-hp
6faea5b4c34 Latest results.
823555a9974 Fix heating capacity reported as zero.
631988519ee A little docs cleanup. Issue an error if IntegratedHeatingSystem elements are used for other cooling system types (rather than silently ignoring them).
19f782dc3c1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
52850cc174c Merge pull request #1214 from NREL/remove_efficiency_defaulting
15e3865d7f6 Merge branch 'remove_efficiency_defaulting' of https://github.com/NREL/OpenStudio-HPXML into remove_efficiency_defaulting
6be32d6b17e Update Changelog.md [ci skip]
7157dbba266 Latest results.
2a2f6e90784 Update HPXML.
c04a1347556 Separate "apply" methods for sip or concrete floors and ceilings
8be91be3744 Replace wood_stud with wood_frame and steel_stud with steel_frame for floors
317a834a190 Remove deprecated constants
f0253e9500f Update BuildResidentialHPXML/measure.rb
6d5c9efd662 First pass.
eee7754d965 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
684fec984a1 Remove old file. [ci skip]
7238f865e2b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
e68308ce695 Merge pull request #1213 from NREL/latest-hpxml-xsd
15d7c072f86 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into latest-hpxml-xsd
5b4769a4e44 Align w/ HPXML master branch. Clean up proposed stuff that didn't make the cut.
86c1f515b25 Merge pull request #1209 from NREL/os350rc2
c0d94e8c9dc Bump.
566714080a0 Latest results.
712982793d3 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
a2f80836fae ci fix
dac99023df7 Include integrated heating system fuel check.
d9dc49479ab minor changes
515cdc37746 Latest results.
074581bbf78 run update hpxmls
afdabb9eaa2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2039bca5f7b fix doc
a10c96cbbe9 Fix real home hpxmls
63871de5248 fix unit tests
2e1ebb83355 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
d6e982045bc Merge pull request #1092 from NREL/bills2
125277de525 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
35a6175ae26 Address final comments.
4016edcb89d Update min/annual charges to be more reasonable. Remove redundant tests.
62924e41da6 A little bit of reorganization/renaming.
2b35ba35806 Latest results.
b5e01636c71 Simplify docs a bit [ci skip]
fb29b673d16 Renames "Marginal" to "Energy". Min charges are now captured in Fixed, not Marginal/Energy.
933d3e480c1 Update docs a bit. Move Sample JSONs so they are available in the release package.
772a6038401 Update changelog. [ci skip]
f3224d94363 Minor cleanup.
176fd79c4aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
193bd70b5b3 bugfix
e889fe4cd71 Add more tests and a bugfix.
ad607c8e355 Merge branch 'bills2' of https://github.com/NREL/OpenStudio-HPXML into bills2
3a1b302176e Shift min charges from reducing PV credit to increasing energy charges. Now consistent with how min charges are handled when there is no PV.
b0c694d414a Latest results.
5d9dca99ebe Update HPXMLs
efadd8f32ca Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
ed3e31f97da Some more code cleanup.
55cac39e7e1 Fixes calculations for: 1. Detailed rates w/ user-specified excess sellback rate. 2. Detailed rates w/ Tiered & TOU and retail excess sellback rate.
b2b96fe212d Merge pull request #1205 from NREL/measure_code_cleanup
a1b01b32377 Latest results.
40010d1630e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into measure_code_cleanup
955a554c82e Merge branch 'measure_code_cleanup' of https://github.com/NREL/OpenStudio-HPXML into measure_code_cleanup
6e687b9c171 Bugfixes.
d62f01929ab Latest results.
97bf38d3632 Merge pull request #1203 from NREL/latest_hpxml_xsd
f468d6f3f61 A little more cleanup.
d831944fe4f Various code cleanup.
45cda3b14d8 Update WA link [ci skip]
5b446cbd715 Merge branch 'latest_hpxml_xsd' of https://github.com/NREL/OpenStudio-HPXML into latest_hpxml_xsd
6844a46d42b Disallow FloorOrCeiling from being nil; most of our code assumes that every HPXML::Floor is a floor or ceiling.
6e7ec2fd85d Latest results.
8fca7071827 Simplify language. [ci skip]
ebfc71c8969 Bugfix.
6cc1c6b1425 This is a little better.
df900264889 Latest results.
c48d3a49288 More updates.
58e8e6863c8 Bugfix 2.
8dca4ae7bbb Bugfix.
0cdf347e7e5 First pass.
1f448c51047 Latest results.
8ace507c312 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
5713606a5b2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
ddd85a82584 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8f5661f234e address comments
83ba25f1a72 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
1abd65ea2b0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
0c5d98e3ad4 Update the changelog
a6a8d52f560 Merge pull request #1201 from NREL/vent_fan_inconsistent_inputs
35b5771ab81 Update HPXML test file.
aec96981670 Prevent recovery inputs from being used with a system type that suggests there is no heat/energy recovery.
638e3657776 Update docs/source/workflow_inputs.rst
2b50432b1a6 Update docs/source/workflow_inputs.rst
e1d878b036c Update Changelog.md
999630df2c3 fix test file name changes
a8a225ddcba remove files no longer exist
98b6faaa418 Latest results.
ffd1b1cbd71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8821be37f58 address EPvalidator.xml with room heat pump name change
df2b9e4779f Merge pull request #1184 from NREL/os350
cccb637e2f6 Update to 3.5.0-rc1
e94640a16e1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
6324e8d2aa5 Eliminate redundant code and some clean up. (Produces identical results for all unit tests.)
cb3e5cef6bc Bugfix for negative PV credit. Unskip tests. Simplify some loops.
4740d45d9bb Consolidate data files, simplify unit test code.
b2e91a68ca6 update with latest schema
a3edf6279d0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8ab6a56b3f1 Merge branch 'bills2' of https://github.com/NREL/OpenStudio-HPXML into bills2
6ae1e5e334f Fixed test_downloaded_utility_rates so that it correctly performs hourly calculations. Added error-checking if monthly data is accidentally provided to detailed electricity calcs.
67d0f5fd13f Latest results.
df639ee9579 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
08bf340cf3a Update README.md [ci skip]
1450fc6175d Latest results.
ba7165576e1 update real homes hpxmls
f79fb55ef08 update BuildResidentialHPXML/measure.xml
6dea4521821 replace 'FloorType/WoodStud' with 'FloorType/WoodFrame'
d06c2aa453c Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
bfd9a70eb57 replaces 'FloorType/StructurallyInsulatedPanel' with 'FloorType/StructuralInsulatedPanel'
d8c77f9350f change FloorType StructurallyInsulatedPanel to StructuralInsulatedPanel
2bdabc12553 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
9ff9a16f0fd run update_measures
7e0bd9c819f run update_hpxmls
df0fdbbcc6b Merge pull request #1200 from NREL/wh_location_defaulting_bugfix
06a7b0bf107 Fixes possible ruby error when defaulting water heater location.
da2e97debb4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
196b36f85be update hpxmls
5c48736158a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
6a75137ce98 Latest results.
dc8bbe65cbc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
d242f552e20 Latest results.
a86acdd41d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
4e219138e03 Latest results.
5bdca9b10cf Merge branch 'master' into bills2
b4fbf9672d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
c980805954d Latest results.
bbaf9b28c8b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os350
b2b1ae1f24b Switch to OS:develop
7e462520547 Remove stray reference to nokogiri. [ci skip]
cd967ee4155 run update measures
91f082421dd update hpxmls
1c673351bff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
45aacfa8700 Merge branch 'master' into allow_additional_floor_type
eacf608fdb3 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
ed62358cda1 run update_measures
548e18f62c1 Latest results.
07c838a17c3 Update Changelog.md [ci skip]
82da02088eb Merge pull request #1127 from NREL/xml_validation
48544b480f9 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
937a0c316e1 Merge pull request #1186 from NREL/revert_kiva_workaround
b55133f385d Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
92ff8600d65 update hpxmls
388ee4539ce Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
6a583922b63 Latest results.
d72d6e94a5d Fix
98f5fec16e1 Revert Kiva workaround.
fe909250a7c Merge branch 'xml_validation' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
05a29539999 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
d1fac6dceba Re-enable tests
22a0085a818 Latest results.
e15e3604eaa Fix CI test.
e8e415b3c9d Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
65baba24cb4 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into os350
d34a51e2da8 Fixed CI tests?
6a474bf9ccd Latest results.
1a97875ac95 Try to fix tzdata on CI, take 2
7b117385619 Skip failing OSW tests for now. Attempt to fix tzdata issue on CI.
cb231358dbf Bugfix.
4bfaf873014 Try docker run
c2884d5edca Updates. [ci skip]
fe4ec3ceba3 Updates to OpenStudio 3.5.0/EnergyPlus 22.2. [ci skip]
334c1c6f031 Merge branch 'master' into allow_additional_floor_type
df1f5c91d7d Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
2d71212167f Revert apply_sip_wall and apply_generic_layered_wall; Add apply_sip_floor_ceiling and apply_generic_layered_floor_ceiling; Code cleanup
4c27eddb6d1 Merge pull request #1181 from NREL/bills2-rates-zip
0111eed942e Update test.
3cb8c812b8d Replace the file.
ec3b8c843f3 Create rates zip instead of tar gz.
68350150c24 Latest results.
044d848d652 Remove debug line.
1e9d9178c69 Apply min charges for rtp; min charges with PV still does not work.
647b536f201 Merge branch 'master' into bills2
711339f3fc9 Latest results.
8075429c726 Merge branch 'master' into bills2
ca7b50122d8 Merge branch 'master' into bills2
2e465e2c126 Latest results.
8e23398e0d6 Add FloorType to a new sample file
cabf3e6877a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
63621c5e2c7 Merge branch 'allow_additional_floor_type' of https://github.com/NREL/OpenStudio-HPXML into allow_additional_floor_type
95e3acabf58 Add apply_floor_ceiling_construction method
9c9263122ee Latest results.
afbed9ca194 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
b9b347c724a Latest results.
7804d280942 Update some sample files
32c263360f0 Add FloorType
217c6b8ffcb Latest results.
884a979f0d0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bills2
c92ab605425 Check bill total for downloaded rates.
b74dd8c1890 Updates to new test.
871652d54da Small fix.
27f1dfb71b3 More criteria for valid tariff files.
788a92c3ce4 Add test for checking all downloaded tariffs.
3100766f546 Add remaining stubbed tests and test files.
6b45be10fba Update measure and tests to use verion 7.
ba2a5591047 Update rates to version 7.
f379e3f2620 Specify version 7 in measure and docs.
9777b31309f Start adding tests for min annual charges.
44bd7fe3021 Support for min annual charges.
a5f996a7044 Debug notes.
9ff8f596f62 Remove unused method.
b742b67906a Start adding tests for min monthly charges.
f8381b93ba7 Merge branch 'bills2' of github.com:NREL/OpenStudio-HPXML into bills2
17616fde21b Better filters and warnings.
63d495d8b2a Latest results.
be881189a72 Update file containing all rates.
e6061a72927 Update bill measure and resource.
2eab8ecdf09 Remove unused fields from sample test jsons.
ddf574bab41 Merge branch 'master' into bills2
e1d7ca83c98 Add rates tar gz.
0003ec75d20 Update gitignore.
39a2f14ac71 Latest results.
9d7868c4949 Update paths in tasks.
870e9583c25 Merge branch 'master' into bills2
2bfd5a2ffba Move more test rates over.
b6b4e0f8e04 Reorg and update utility rates download.
c645fb20087 Merge branch 'master' into bills2
e4e856dc4b8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
969e8879f9c No longer need separate XSD/Schematron validation on the CI; now performed in test_validation.rb.
3a825d5ce90 Merge branch 'master' into bills2
64251f25a5b Update measures and tests.
9ec746ace22 Update epvalidator and docs.
070f6d700bd Latest results.
79df2112c82 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
be63721cacf Latest results.
fd866dcdf3f Use correct parent path for tariff files.
aef448b6da7 Fix tariff filepaths.
91665157026 Clean up some more.
762bb77d6ba Clean up unused vars.
b6c1e1f671f Get detailed test working and stub the rest.
9b4b788e415 Get simple bill tests working.
d1e3b05f305 Merge branch 'master' into bills2
3f415d161bb Yep, it's needed.
6bc633e8055 Check if this is still needed
e40df4011ae Install sphinx rtd theme via apt?
ac80088b215 Try again.
c08d0779366 Try again.
526a9d12f33 Merge branch 'xml_validation' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
92733531583 Attempt to fix tzdata install
970632de3cf Latest results.
e4a2e2e2435 Remove old validation code.
e2c42b9d61e Bugfix. Also fixes tests when running in a dir with spaces.
34ff3481569 Try dev-3.4.1
c221db96ee4 Suppress warnings during validation tests.
7b28c73d44b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
134e72ac86a Clean up displayed xsd errors; update expected validation test error messages. [ci skip]
36d023ab1a1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into xml_validation
43f7784b861 Bugfix. [ci skip]
bd8d44ed757 First pass at using new OS SDK XML validation capabilities. [ci skip]
b8457ea8b91 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
7b138956302 Latest results.
4f79fcca0a5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
0812fbe58d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
be311474b16 Include skip keywords.
f749d44f6ae Update worklow outputs docs.
6ec3b7a23d9 Add missing demand json.
f663a1f926b Remove demand init vars.
9adc5ba8c7b Catch demand fields and write test.
adee52da75a Merge branch 'master' into bills2
6e1d9509183 Merge branch 'master' into bills2
0cf7ffbc4f3 Update detailed tests expected values.
fe27f81a7c3 Update test file and resources.
88bdbc78bd9 Relocate annual true up method.
3a8448c78b5 Get real time pricing tests working.
7bf0176d8dc Stub tiered time-of-use with pv test.
fc67b95c24d Get all time-of-use tests working.
e0083018031 Get all tiered tests working.
9dce18fc7ef Merge branch 'master' into bills2
c36df72c80d Get pv with detailed bills working.
b9a30d0df47 Merge branch 'master' into bills2
01babbde5cf Introduce detailed tests with pv.
bbc2988aa03 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
51e97de790f docs and minor epvalidator chagnes
c0611f99232 Updates to get tiered tou working.
37242d35f9e Update tiered tests expected values.
1c0178b1b70 Update tiers in sample jsons so we can actually test.
99201c100e6 Convert remaining sample rates and create tests.
a7f5397d6eb Update test framework.
115954eb5c6 More refactoring issues.
fac015a0fa7 Latest results.
e721b662bb4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
9dc1a2615e0 Resolve merge conflicts.
c11a8532b73 Merge branch 'master' into bills2
9408d4e0a0a Support real time pricing and add test.
601f69a8078 Add sample jsons and convert tiered tou.
1c607304f55 Progress on detailed bill method.
cb5cf073113 Process test timeseries for monthly or hourly.
a03af2f445e Reorganize.
4dd9c423eeb Start stubbing detailed electric method.
7a93805f8f8 Merge branch 'master' into bills2
84220c2795e Fix issues with file paths.
65011326a1b Download and test updates.
cd237bff71c Create jsons from csv bulk download.
8aa350ae655 Enable remaining args and update tests.
0bff5d909c0 Introduce bill type argument without breaking existing tests.
cb49fd7345c Introduce electricity_bill_type argument into measure.
9f84e12934a Update gitignore for downloaded rates.
91e6d80c8a8 Get download of all tariffs working.
89c8bbc47db Merge branch 'master' into bills2
246a314e155 Stub method for processing large downloaded json.
3324c97d91b Add new task for downloading utility rates.
47e176eb68d Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
1a885df8acb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
d286001d701 oops
15f2a270fbe Latest results.
be36b282138 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
255f1ed3a32 fixes
534efd3cdbb Latest results.
eca5125d5a5 change changelog to be next release
f4a3941ead2 fix unit test
d2a5988e69c Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
c433652235a fix crankcase
c96ddcc25d3 Latest results.
4e81e36c83c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
da3a42a2476 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
1a861ba659f heating sizing results for ptac/roomac with heating
b182213be4c fix cfm_per_ton for room hp
e6327e5016e Latest results.
c22379cee5a Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
decef7c46b4 fix test
0d0f587defc Latest results.
4e220c6a23b only allow COP as efficiency unit for room heat pump
5c2aca714c1 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
86e0cde64b0 fix test and example files
607727883d2 Latest results.
f90a41898e1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
c5b4cc5d7aa another bugfix
95b6763e255 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
83af841efbe bugfix
35641322f06 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
8c3b4867f8b run generate_hpxmls again
a311c9fb501 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
2a4b73fb71e update hpxmls and bugfix
c239e108551 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
f9c91796143 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
ce7fb53c784 first cut for alternative
79cebac1b88 Latest results.
552c241ae4d Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
36e1393d12e tests
6c0672f3618 Latest results.
29a5edc245d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
86836699f07 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
0de851b66a1 update measures
4039e7425d7 add room ac with heating
927d1b0e6d4 Latest results.
15b53e79118 update measures
846a9e16cd0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
75762d72a04 Latest results.
bb4598eaa8e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
88ea8a0c118 Merge branch 'window-hp' of https://github.com/NREL/OpenStudio-HPXML into window-hp
810f49d362f validator and schema change
5e008ae99a2 Added EER CEER warning for PTAC to be consistent with room ac
1314eac1f45 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
0d8a7d5b45f Latest results.
202ab121789 one more name change
597aab8041c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
73fcae779f8 renaming
14d8c5bab1c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window-hp
92017cd488c Latest results.
e234cfe31b7 fix tests
63417ba909a add backup system
636230d1363 fix test
727e565ce46 first cut

git-subtree-dir: resources/hpxml-measures
git-subtree-split: a553129100342f14f6db9a8fb81c46c435062379
@joseph-robertson joseph-robertson added this to the ResStock v2.6.0 Beta milestone Nov 14, 2022
@joseph-robertson joseph-robertson self-assigned this Nov 14, 2022
@joseph-robertson joseph-robertson marked this pull request as ready for review November 16, 2022 01:06
@joseph-robertson joseph-robertson merged commit 770eb46 into develop Nov 16, 2022
@joseph-robertson joseph-robertson deleted the latest-os-hpxml branch November 16, 2022 01:19
joseph-robertson added a commit that referenced this pull request Feb 3, 2023
…f619e

75de13f619e Simpler fix to negative peak/design values.
51dbd82f910 Merge pull request #1007 from NREL/negative_peak_flow_rate
f5ee3eee6a6 Prevent possibility of trying to set, e.g., negative peak flow rate.
0a561c1369e Merge pull request #1006 from NREL/door_bugfix
b5440086603 Bugfix for cases where door R-value w/o air film goes negative. (Can occur for, e.g., CZ 1 where IECC door U-factor is 1.2.)
602378b40ca Merge pull request #1001 from NREL/eri_reporting
ce9a1a6b90e Latest results.
1a9b90987d5 Increase number of output decimal places and a little code cleanup.
c67d0f7a780 Update xml
59bab55d0bf EC bugfix.
66d21ad412d Refactor/simplify ReportSimulationOutput for ERI purposes. No longer creates a separate *_ERI.csv.
0457f4db9f9 Revert "Add HPXML has_fuel helper method."
365c8e2fcdd Add HPXML has_fuel helper method.
c8b56ceb83a Fix case.
67e93b0c152 Clarify documentation for interior surfaces (or flat roofs) regarding Azimuth/Orientation defaulting.
a7f6341d493 Merge pull request #999 from NREL/shared_recirc_temperature
d5fc0daed83 Drop ABCDE
4bb47a2d00a Updated xml
5c3c071f772 Adds support for shared hot water recirculation systems controlled by temperature, per ANSI/RESNET/ICC 301-2019 Addendum C.
916014c91c8 Merge pull request #996 from NREL/battery-docs
48503939ee9 Merge pull request #995 from NREL/fossil_fuel_emissions_factors
d0a9528e078 Minor tweak.
9c4727d50e7 Adds some explanation for how batteries are controlled and other misc cleanup.
6d9edb4f618 Latest results.
e0369eb925d Rename "CO2" to "CO2e". Updated cambium data to be CO2e and combined (combustion + pre-combustion).
6c9cd855816 Updated default fossil fuel emissions factors to include pre-combustion (e.g., methane leakage for natural gas).
58bccc6420c Merge pull request #992 from NREL/minitest_helper2
9b7ce3f3c02 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into minitest_helper2
6a451ecdb45 Revert to original config
713fb844c91 Merge pull request #993 from NREL/goodbye_beta
bfa2365a843 Remove the "Beta" label from the BuildResidentialHPXML measure. [ci skip]
f5729c759b8 Aha, this test file was not loading minitest_helper.rb.
77ca82d4152 Try excluding build_residential_hpxml_test.rb
854d4ccb090 First, reproduce issue on CI.
d174ace1df1 Merge pull request #987 from NREL/hvac_iq_limits
9d40f9e25e6 Update Changelog.md [ci skip]
7a1644d70e9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_iq_limits
06bd81964cc Merge pull request #986 from NREL/docs_on_ci
afe5d64f823 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
e5de16e128d Merge pull request #988 from NREL/minitest_helper
66bf8248d02 Possible fix to obtain code coverage on CI?
e6ee2daa0cb Try reverting minitest_helper.rb change.
33b4d180cf9 Adds more stringent limits for `AirflowDefectRatio` and `ChargeDefectRatio` (-0.9 to 9, which now allows values from 1/10th to 10x the design value).
f1c13fb6871 Re-enable CI steps
913f947f19a Fix error?
3c21bf713a8 Install pip
3afc9dcf5c0 Install sphinx
f8e4ca4a4c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_on_ci
f0844a93edf Merge pull request #978 from NREL/leap-year-handling
040604b1106 Add newline
44224c6a06d Build docs on CI, store as artifacts.
852a36d084f Update workflow test file.
bc8ccc2868a Update error test.
219cbdfee88 Update error message.
69319016c04 Update changelog and docs.
f782deade4f Merge branch 'master' into leap-year-handling
39686d9de69 Merge pull request #980 from NREL/report-sim-output-setup-fix
a80a1f25183 Return if model not retrieved.
6dd4463a51d Latest results.
335370e3c0b Update defaults header test.
bbd8c3bcc1a Add test for throwing error.
24936969f9e Throw error if leap year with TMY.
14519b064f5 Clean up translator measure.
c7a8ad6a2ef Change to non leap year in test xml file.
6a1ea0ad3ba Update README.md

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 75de13f619e9b4b98f7f33889caf8de406f6ea07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant