OS-HPXML v1.7.0 #688
Merged
OS-HPXML v1.7.0 #688
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
704f0d1488 Merge pull request #1455 from NREL/buildreshpxml_duct_fractions efd774aaca Clarify docs. 67e71f32f5 Prevent possible divide by zero error if duct area is zero (e.g., because the number of return registers are zero). 8622c16013 Update comments/changelog [ci skip] 77bbfa880a BuildResidentialHPXML measure: Allow duct area fractions (as an alternative to duct areas in ft^2). 94d3b0b969 Update README.md [ci skip] b6fc15547a Merge pull request #1451 from NREL/minitest aafae74fe7 Address minitest release change that causes CI errors 73f5c6f80f Merge pull request #1449 from NREL/eia-2022 d4e00dbbf7 Update comment. 95e33500aa Few minor updates. 4e8075b758 Latest results. ef3da1442d Merge branch 'master' into eia-2022 6f1a6b5787 Update the changelog. 791d06340d Updates for gas, oil, propane. 241b05c07e Merge pull request #1448 from NREL/buildreshpxml_cfa_served2 27b787769e Merge pull request #1447 from NREL/has-fuel-fix 02caf0a382 Update default test for new elec rate. f1b18573e7 Update utility bill tests to fix elec rate. 2ae4b407f1 Point to new 2022 column in electricity csv. 3d7b47c539 Add updated electricity csv and link. 16b08a31b9 Latest results. 1c5eddabae Implement solution. 3ee9ecfed1 Update hpxml inputs json with failing sample file. 8070cd0dc6 Hit expensive operation just once. 40c4b6a963 Update has_fuel method to catch gas fired pool and hot tub heaters. 0046eb678b Merge pull request #1445 from NREL/shorten_json_filename 89f1a99fa6 Add comment [ci skip] e849b90ba8 Renames ReportUtilityBills test file so filepath is shorter. 6945e05bbd Merge pull request #1442 from NREL/report_outputs 28b9f620cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into report_outputs 10f6880b30 Update Changelog.md 0234854416 Add test. 5d2a7c3aba Merge pull request #1441 from NREL/buildreshpxml_cfa_served 290b12c0a9 Add outputs back into reporting measure. e56b1948f8 Latest results. 78bc6c366c Add test file to demonstrate fix. 43a992e6b4 Fix air distribution CFA served for central systems that don't serve 100% of the load. 4f093def65 Simplify fraction duct area docs [ci skip] 71daa5d214 Fix typo in docs. [ci skip] e80ced8715 Merge pull request #1439 from NREL/duct_lto_warning 159cb7bac8 Latest results. df73641ca3 Bugfix. b575f71ed7 Moves duct LtO warning from schematron to ruby measure, so that it can handle cases where the duct location is defaulted too. fec8230241 Merge pull request #1437 from NREL/peak_elec_annual_output 6ce4cac311 Latest results. e3e3eedac4 Adds "Peak Electricity: Annual Total (W)" output. 733135a96a Oops. 3de7069d6d Merge pull request #1436 from NREL/space_heater 80a9dc8674 Latest results. 6f85ab912c Replaces `PortableHeater` and `FixedHeater` with `SpaceHeater`. 20e965eeba Merge pull request #1212 from NREL/batteries2-resilience c4fb043169 Latest results. d39b516a97 Minor tweaks to changelog, docs. [ci skip] 176ba83e36 Merge branch 'master' into batteries2-resilience 1f113e818e Merge pull request #1431 from NREL/bugfix-cond-basement-full-slab-ins 9857a70be7 Latest results. 510a022157 Bugfix. b3e69f1c57 Add test file that illustrates error. f0402154a3 Minor updates to docs. [ci skip] 420eb2675d Skip resilience calcs based on include args. 9ab39d9b79 Further reduce duplicated code. a9188d845e Add output test for monthly resilience. 40f047428a Simplify forcing monthly outputs. 324ddf2379 Clean up in changelog, arg descs, docs. dc64a8284c Update ReportSimulationOutput/measure.rb df29e9c6e8 One more documentation update, suggested by Scott. fc00a8a7f5 Merge branch 'batteries2-resilience' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience 1f712063b7 Update documentation f9d741dce4 Latest results. 47a24358a8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience 1c60992084 Merge pull request #1426 from NREL/fix_sum_error f986911f78 Latest results. 63b55fe336 Fixes possible "Electricity category end uses do not sum to total" error for a heat pump w/o backup. 36d7255991 Merge pull request #1340 from NREL/mobile_home_belly_ducts af2b74ba2e Need to remove it from here too. 402957ef52 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mobile_home_belly_ducts 7e9f9b29d9 Update line endings 3eb69d2a15 Update line endings ad466492a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mobile_home_belly_ducts 78c8d1dbe4 Add gitattributes to prevent HPXML EOL diffs 48d29e5983 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mobile_home_belly_ducts c429b1fcac Latest results. 448c4c7c03 Merge branch 'master' into batteries2-resilience 0a519a7ccb Merge pull request #1408 from NREL/build-res-sch-file-readme a4e4ca1b38 Merge branch 'master' into build-res-sch-file-readme 3e8347e495 Merge pull request #1420 from NREL/schedules_with_mixed_timesteps 52af200f73 Expand the original schedules hash. f247eebdef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedules_with_mixed_timesteps 95cbda0eed Merge pull request #1365 from NREL/monthly-bill-outputs e3f9ab9094 Latest results. 5a0dd75b92 Remove whitespace. [ci skip] a9fd090c0d Try updated method with 3 unique schedule lengths. 4f7a10a6fd Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 4182197f28 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into monthly-bill-outputs 13e10a4db4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedules_with_mixed_timesteps deb2c5e0e2 Merge pull request #1423 from NREL/hp_equal_lockout_temps 38edf06ae5 Latest results. 8465951f09 Latest results. ec971eb705 Fixes error if heat pump `CompressorLockoutTemperature` == `BackupHeatingLockoutTemperature`. 4199ec71b5 removing unnecessary water heater in mobile home belly testing file 77f664ef98 Latest results. 7db0d5f1a8 Add sample file with outage and mixed schedules. 57a44a8f48 fixing water heater error messages in tests 66d5d6443f Update the changelog. [ci skip] 9b00b5a926 adding break for defaulting skirt present b1cb896a35 no longer allow belly for water heater location ed2121a4eb updating docs for manufacture home belly in UnitLocation d568fd0993 Apply suggestions from code review de18878824 Latest results. 5f9548df84 Set setpoint args to null in new sample file. 154b45476a Update export method to expand schedules with fewer elements. ca1764845b Correctly handle not including annual bills file. 24ee417c9a Update remaining tests. f55f603b96 Demonstrate error. 2bd7616626 Refactor bill test file. fd1ef0e01d Get only monthly values in run period. dcb7cce561 Update the docs. 8a12ae9a42 Latest results. 5bf22a413d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mobile_home_belly_ducts 99676f08a1 Simplify run_simulation.rb by removing some rarely used options. [ci skip] ab25d31eeb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into monthly-bill-outputs 97a94432e7 Merge pull request #1403 from NREL/foundation_translation 3286f37c63 Latest results. 80cf2bc8ae Update measure xml file. 6f54706388 Merge branch 'master' into build-res-sch-file-readme bb7939512b Update test. e09e31a0b1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into foundation_translation ed91076b2a Merge pull request #1417 from NREL/lighting_kwh_multiplier_bugfix 1baf8cc397 Latest results. 4d529ae5b7 Bugfix. 5aa9394e7a Latest results. 84e4cb2931 One more minor bugfix. d8872d323a Fixes lighting multipliers not being applied when kWh/yr inputs are used. 3b51b59733 updating docs for AssemblyRValue of manufactured home belly 91e059687b removing commented out NoWind for ASHRAE 140 becasue it's being done elsewhere c94a03640b updating changelog 2d32801ffc Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 5b8c76dda7 Merge branch 'master' into monthly-bill-outputs 6bd47d9fe2 Merge branch 'master' into batteries2-resilience 12333b1103 Merge pull request #1414 from NREL/heating_system_2 0ac7de4c9f Re-enable warning. [ci skip] 2f3bc9c1ef Latest results. 2936f8c5a7 Remove fixme comment. 46de010fab Use msgpack meterdata for monthly timestamps. a77f9a04d0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience ba7d63c186 Remove debug stuff 103fe6eea5 Fix tests. 9f93842b8d Update tests for new monthly file format. 98c00b7760 Round monthly results. 7d8502cff3 Write monthly bills to look like timeseries. 0ed9fd4fac Latest results. b0a6d62c40 Apply rubocop. bbcea368f5 Merge branch 'batteries2-resilience' of github.com:NREL/OpenStudio-HPXML into batteries2-resilience 4b122becf8 Add ems battery loss to crit_load. efda915e5b Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts d7cb726c5e moving floors over ambient back down to z=0 for ASHRAE 140 tests 0545532811 Merge branch 'batteries2-resilience' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience 326307cef8 Some updates to resilience calculations, Joe is going to help me take battery losses out of the Electricity:Facility so I can wrap up testing. Thanks Joe! 59035cc339 Merge pull request #1415 from NREL/v170 84c729f126 Minor cleanup. [ci skip] ce091d1642 Merge branch 'v170' of https://github.com/NREL/OpenStudio-HPXML into monthly-bill-outputs e6eab0a1c1 Prep for v1.7.0 ca2c03de14 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into monthly-bill-outputs fedffb1040 Latest results. 11542a1ad2 adding validation of manufactured home belly only on manufactured home building types 40e72b24ad adding mobile home belly to water heater enums 38be4eddab updating hpxml schema to add mobile home belly to UnitLocation b97255638c Latest results. ac559fd95a update xmls 3ed6d39dcb update measure.xml f88c04f4d5 Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts f798647d40 Latest results. fb2fd345e3 Fix bugs related to hvac distribution assignment. 69937ba975 Add sample file for shared boiler with secondary fireplace. f1ecdf84f9 Latest results. 8e7b8e4858 Merging in some of the other checks from REopt: we weren't actually charging the battery off of PV if you're net generating in the prior implementation, and we should be. 3b9f0fd87f Latest results. fd20aec87c Try a return when batt_soc is not positive. 20fd0758e9 Merge branch 'master' into batteries2-resilience 223240d1fc Update the readme in the resources folder for the build res sch file measure. f21ac6dae5 Latest results. 24d7f1105e Merge branch 'foundation_translation' of https://github.com/NREL/OpenStudio-HPXML into foundation_translation 6ce1839791 Small bugfix for foundation wall design load calculation. Code cleanup. 30a4916f32 Latest results. d0ae074d17 Collapse foundation walls that only differ by below-grade depth and calculate an effective below-grade depth. This can improve runtime for e.g. homes with walkout basements. e2f4747a8d Latest results. 44095896b1 Use identical insulation properties across similar foundation walls in the two HPXML files. Small HVAC sizing improvement. 3899cc54b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into foundation_translation 2cff2ae3ee Merge pull request #1405 from NREL/foundation_hpxmls a2d07f76b2 Latest results. 6c6279b245 Cleanup some HPXML files with respect to foundation inputs. d560ac81eb Latest results. 9fb058aa50 Fix CI test. c02b5b45a7 Update HPXMLs, bugfix, and cleanup. 846dde37a5 Test monthly total across fuel types. 726b640480 PV credit to final month, and add monthly total across fuel types. b766d90d67 Improve some of the real_homes HPXML files. Further simplify/refactor translation code. 220b81355a Merge branch 'master' into monthly-bill-outputs 145dda3135 Merge branch 'foundation_translation' of https://github.com/NREL/OpenStudio-HPXML into foundation_translation 49b9f2f4c5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into foundation_translation 302603ffa8 Latest results. 3d161738eb Merge branch 'master' into batteries2-resilience e2f00fa6fd Merge pull request #1399 from NREL/os361 fd18347253 Latest results. a6bc2d7154 Latest results. dce5840392 No longer require Slab/DepthBelowGrade for certain foundation types. Some cleanup and additional tests. 6a05f7d0fd Merge branch 'master' into monthly-bill-outputs d79630236c Finished first pass 4b444e462b First pass on simple case (base.xml) 9964e09a53 Add unit tests. 53033487f0 Merge branch 'batteries2-resilience' of github.com:NREL/OpenStudio-HPXML into batteries2-resilience 39485542b0 Update output tests. c385add00f Ensure a msgpack for extracting timestamps. 2616fef130 Latest results. fd0c5be78d Update the docs. 6b68fdb071 Update the changelog. ef05ac18b9 Move annual resilience outputs reporting down toward the end. 3a64f0f66c Latest results. a770bbd2c5 Merge branch 'master' into batteries2-resilience a8f4f2ee9c Set year to hpxml sim calendar year. 8d440e2f59 Fix for when not requesting resilience timeseries. f04d1ddf2c Bit of converting duplicate code into a method. b575f78be8 Merge branch 'batteries2-resilience' of github.com:NREL/OpenStudio-HPXML into batteries2-resilience e1372800c0 Refactor to support non hourly reporting. a3ed2f2244 Latest results. 5b3c4a9a5a Merge branch 'master' into batteries2-resilience efc840216a Latest results. b433d069d5 Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 3fa2b54917 changing epvalidator to look for 'manufactured home underbelly' 4ddb0a8b1a updating EPvalidator with manufactured home belly in UnitLocation 3421d6a7d0 updating with latest hpxml v4_0 007b35f85c update_hpxmls da526490e4 update_measures 5df205e64b Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts feb88fa698 Merge branch 'batteries2-resilience' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience 382e22d678 Clean up some other approaches 4c9a9f74e7 Latest results. 6a3f5c8d26 Merge branch 'batteries2-resilience' of https://github.com/NREL/OpenStudio-HPXML into batteries2-resilience ae552b4caa Updates to the logic for calculating resilience hours. Working on checking against OCHRE, still need to test short timesteps. Also comparing against OCHRE calcs. (keeping some debug print statements until that's done) 1a80225c28 Latest results. 90b260fc63 Merge branch 'master' into batteries2-resilience 3f0dfd0af8 Few minor updates to bill test file. 20e8362fe0 Latest results. 253b2a39d3 Reimplement the monthly utility bill tests. 088e1a9a43 update measures 601468fb47 fixing surroundings generation 2b8f2f76f1 update_hpxmls b3420f5b5f Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 87d0f52367 Revert monthly utility bill tests. fc6548530a adding schematron rule for floor adjacent to manufactured home underbelly dfd2b59464 update_measures b12753cc53 Apply suggestions from code review 822f5b15d4 Merge branch 'master' into monthly-bill-outputs 8b87618c51 Latest results. ea065ee97f update_measures 6f8da5f2bc update_hpxmls 640def6848 Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 0eaadc62d5 Latest results. 8b506efa42 Merge branch 'master' into monthly-bill-outputs fd788b44b2 Update the docs. f2a771af74 Separate method for producing monthly utility bills output file. e21c801366 Merge branch 'master' into monthly-bill-outputs eeba3bb710 Merge branch 'master' into monthly-bill-outputs 017aa799fa fixing messed up merge of hvac_sizing.rb 614181c08f Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 2e6aef680f Simplify code to assign production credit to final month. 3984b17191 Fix docs table. ddced2708b Force decimals in bill init. 79f246470a Update the docs. d75820b8ae Remove unused header pass. 91b480e69c Merge branch 'master' into monthly-bill-outputs 433bce5423 Latest results. 151dc7f232 Introduce annual resilience arg. 04408e1188 Another arg update after merge. 4121597242 Latest results. 37ad005292 Update arg after merge. e4245aaf39 Merge branch 'master' into batteries2-resilience 40feb886ad updating docs e22bccd6d6 updating measures 34f8cb93e2 Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts def742c18a removing need to have a Foundation element for belly and wing 9c3af10a67 Latest results. e10adcc951 fixing tests for mobile home simulations 9b25bb9a9e Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 7b8ad890e2 Adding a mobile home without a skirt a0a396f959 Update the changelog. [ci skip] adf545e17d Fix monthly pv credit and tests. 9bd53ac646 Default to generating both annual and monthly bills. 710521d9fe Fix docs and set monthly in run_simulation. 39fc065ffc now with mobile home skirt in BuildResidentialHPXML 55e6047c58 updating BuildResidentialHPXML to output manufactured homes 6d37d55d95 Update the docs. c9583ef43a Include monthly totals when requesting monthly outputs. 17ac7e915d Update the changelog. 0358c0517e Make annual and monthly bill outputs optional. 0b38b81e41 Latest results. c8f13fe957 Merge branch 'master' into monthly-bill-outputs bc792715b9 Ignore monthly bills in stored results. 1c9c797a13 Fix docs table formatting. d6d1d38f55 Latest results. ee1a1fe389 Fix tests. 9e3ffda639 Update docs and changelog. [ci skip] de33f498df Fix utility bills test file. 2ccb81114e Update the docs. 7e91efe2d8 Offset month index so we can output correctly. 033af691ce Bump month index by start month. cf8e9112b0 Output monthly fixed and energy by fuel type. 0e35958868 Latest results. 6a473fa488 updating HPXML.xsd 2ad17ae0df Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 353868f414 Latest results. 121be95026 fixing test errors 45e5d1611a updating error message in schema test 8e664d685b raising up belly and wing and ambient foundations 2 ft 090ed74746 removing debugging print statement ebda9ed62b fix indent [skip ci] 85dad66744 Merge remote-tracking branch 'origin/master' into mobile_home_belly_ducts 3299b70a88 adding ducts in manufactured home belly 0f0713e5be modeling under belly as ambient, wind follows skirting fa20f2a45e it runs 414b702b5b saving my place in some broken code 8728ef88d1 renaming to belly_wing_skirt_present ba36c22bc1 adding BellyAndWing to Foundation class in hpxml.rb f766c913f3 adding special case duct location code for mobile home belly 22d0920d7a Latest results. a143ee0351 Merge branch 'master' into batteries2-resilience 5770bddbbd Latest results. 914f34bdee Add reporting test for non hourly resilience. 35ecb00029 Only report resilience timeseries if hourly. 441c25f1de Merge branch 'master' into batteries2-resilience fb57a34069 Latest results. de4904a4be Merge branch 'master' into batteries2-resilience 4acd25c07a Merge branch 'batteries2-resilience' of github.com:NREL/OpenStudio-HPXML into batteries2-resilience 41efbe09e8 Update new output reporting test. 8c7d20c91d Latest results. f1d4a11f37 Merge branch 'master' into batteries2-resilience 24d22bd22f Latest results. ee3dcf25c1 Update run_simulation script for new resilience timeseries argument. 59206a0f7a Add ability to request resilience timeseries. b937c0e751 Merge branch 'master' into batteries2-resilience 0776491025 Latest results. a36e6b80ac Incorecctly sppelled output meter. 043c731dba Pass in roundtrip efficiency and clean things up. 68b669dd71 Merge branch 'master' into batteries2-resilience 9a1d392f06 Save progress. cc6aaf3d56 Merge branch 'batteries2' into batteries2-resilience 41d79e8bdf Merge branch 'batteries2' into batteries2-resilience 44e0939315 Calculating actual resilience hour values now. f8849a7efc Merge branch 'batteries2' into batteries2-resilience c6ee97f509 Remove debug. 46e95eb723 Stub actual resilience calc method. 866e5aedfa Merge branch 'batteries2' into batteries2-resilience 01eeee05ad Define new output. git-subtree-dir: hpxml-measures git-subtree-split: 704f0d1488aa0770b46b159a6a1904917520821b
…latest-os-hpxml # Conflicts: # Changelog.md # workflow/tests/base_results/real_homes.csv # workflow/tests/base_results/sample_files.csv
ed024c39af Merge pull request #1491 from NREL/hpxml_v4_conditioned_space 3e857ce84e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v4_conditioned_space 499fae7571 Merge pull request #1490 from NREL/hpxml_v4 f974b29c52 Merge branch 'hpxml_v4' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v4 6d171e75fa Add warning for portable spas; move other warnings from ruby to schematron. Add tests. 2934a76aba Latest results. 8c857a758b Latest results. f2377cb0ee Update project URL [ci skip] cc8369bf2a Rename [ci skip] 9ec8f423f1 Automatically add issues to project board. [ci skip] 1c29c0f7f3 Merge branch 'hpxml_v4' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v4_conditioned_space 4450d6fd7c Missed one file a4280a1b04 Merge branch 'hpxml_v4' of https://github.com/NREL/OpenStudio-HPXML into hpxml_v4_conditioned_space e9f95ae0c7 Fix CI failures. 67c0e2efc0 First pass on using "conditioned space" instead of "living space" 8e40cee43b First pass on updating to official HPXML v4 schema. c6fe8903fc Merge pull request #1486 from NREL/dfhp_sizing_docs 6b099bad0a A little cleanup. 78e37b5425 Document autosizing methodology for e.g. dual-fuel HPs. c28a3a350f Merge pull request #1483 from NREL/misc-cleanup 57b77b914d We shouldn't set a default value for an optional argument, as we want the OS-HPXML default (downstream) to be used. 1278ca1c03 Set idref to nil on cw and dw when wh is deleted. 6086d84d8e Remove unused array in build measure. 369eda63ac Merge pull request #1480 from NREL/hpxml_sync 0a1ea17e99 Sync w/ hpxmlwg repo 4fd2701e4f Misc updates to docs. 0f80b93a49 Merge pull request #1467 from NREL/build-res-validation 4de9a0a6f3 Another remove. 7fb1dfc97e Remove checks for bad duct defaults. 8dbaf08de7 Merge branch 'master' into build-res-validation 7b8cd4df3e Update the changelog. [ci skip] 9b51701f0e Clean up test file. bbffe1e003 Merge pull request #1466 from NREL/pandas-updates 80c9fcbf43 Merge pull request #1469 from NREL/better_warning_checks d0e8d048fe Better warning checks. 31931317b8 Catch errors for certain duct surface area arg combos. 1d968719b9 Add test for demonstrating invalid defaults. 213e506092 Must write defaulted hpxml_doc before validating. 8212560c97 Update apply_validation arg in build test file. 5429fbd508 Change behavior of apply_defaults and apply_validation. 26d0f04be6 Wrap pandas read_csv method to handle new version. e96a47e70c Merge pull request #1463 from NREL/generic-locations a735dcdf45 Fixes error message for attic_type. Also removes unnecessary local variables. 14c97553cc Update the changelog. [ci skip] 36943966ad Simplify the new methods into one. 3872171929 Merge branch 'generic-locations' of github.com:NREL/OpenStudio-HPXML into generic-locations 5ec271c86f Fix typo. ae6c4feb15 Latest results. 8d09f52079 Move tests over to build measure test file instead. 18878be10b Same for water heater and battery locations. 2351cdab9f Latest results. 0b1a2e7654 Add new sample files for additional duct location choices. 6d606b8fc9 Update duct location argument with new generic choices. 4736920950 Add generic attic and crawlspace constants to hpxml resource file. 29f870e358 Address some FIXMEs. [ci skip] cfad443ab8 Merge pull request #1461 from NREL/hp_temps_error 807b1cd193 Bugfix. db7b8cac38 Throw error if compressor/backup lockout temperatures are close to each other for HP w/ electric backup. git-subtree-dir: hpxml-measures git-subtree-split: ed024c39afb256d5a305f980a471da536c8dbbc3
6f5c45653f Merge pull request #1386 from NREL/gshp_fanpump_adjust babbf2ea6c Update Changelog.md 6b67240117 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 060e044e95 Merge pull request #1433 from NREL/split-battery-losses 2655f9aead Update the changelog and docs. [ci skip] fef5928271 Latest results. 1e685c3428 Merge branch 'master' into split-battery-losses 207443e18d Go with the exponent approach for splitting losses. caa342429f Another try [ci skip] 76d97c6c2c Another try [ci skip] 3ef801f026 Another requirement? [ci skip] a7bf56a81f Fix RTD 5acc163302 Be helpful and search additional locations (and be backwards compatible) a5dcd1a14c Latest results. 5389a6f388 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split-battery-losses 055b52aed2 Merge pull request #1500 from NREL/epw_path_bugfix d72dafae3f Clean up Location.get_epw_path method. 0215e468ad Fix possible simulation error related to EPW path. 7edc02eaf9 Merge pull request #1489 from NREL/resilience_battery_losses 1237e529ff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resilience_battery_losses 143583f80f Update changelog [ci skip] 09097cd83c Latest results. c68cd4de43 Bugfix. 927ff665ef Fix cases w/o batteries. f12b1b4cfa Fixes battery resilience output so that it includes battery losses. 1bbfaf6d71 Change split in charge and discharge inefficiencies. adc9580a56 Latest results. 3a961906f7 Update expected cop values in gshp unit tests. cfbf0c72bd Merge branch 'master' into gshp_fanpump_adjust 9123259c05 Merge branch 'master' into split-battery-losses b177298065 Latest results. b9b3bc3ec1 Merge branch 'master' into split-battery-losses f0ccd0d42d Latest results. b7dffa88aa Merge branch 'master' into split-battery-losses 037d48753f Add a sensor for discharge. eafe7187bc Latest results. 1700de7323 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 8eaad36963 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 823c299f9f Same result, but equations are simplified and more readable 0b45c71ef0 Latest results. 0bedf67a04 Use the new adjustments, not the old ones. Oops. 03d571f21e Updates to fan/pump adjustment. Now gives reasonable values, slightly different from the old adjustment. Still needs a little cleanup before review. d069304431 Merge branch 'gshp_fanpump_adjust' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 6ed5ff552b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 44a23717a5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp_fanpump_adjust 265c88f190 Moving to a size independent calculation 194a2d4161 Initial attempt at adjustment. Moved the fan/pump adjust code to right before we need the values, rewrote fan/pump adjustment to account for sizing. Still need to double check pump adjustment is being applied correctly. git-subtree-dir: hpxml-measures git-subtree-split: 6f5c45653f3c7718b8e5fddfeacf7c278eeed5de
be05374c62 Merge pull request #1516 from NREL/update-rtd b7236574f5 Fix RTD per https://blog.readthedocs.com/use-build-os-config/ [ci skip] d342da3375 Merge pull request #1511 from NREL/backport_hvac_sizing_tests 5921fbc6b2 Latest results. 6ffebe9ef8 Backport NREL/OpenStudio-HPXML#1501 to the master branch. 2e750ede8d Add the expand icon back into nav pane. git-subtree-dir: hpxml-measures git-subtree-split: be05374c6235444041aae4460c128e84a293d79e
…latest-os-hpxml
506f8f9b01 Merge pull request #1476 from NREL/os370 39e4d015bf Cleanup. [ci skip] 6e68f8a736 Merge pull request #1175 from NREL/incident-solar-multiplier 7f731f1d18 Latest results. 9a0a3a96c0 Re-enable Windows CI test [ci skip] 6f3f80bc2e Update Changelog.md [ci skip] 3d6a1846dc Merge branch 'os370' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 2d225df62d Latest results. 9fc35028b6 Run CI 7043d780b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 e988eefe99 Update changelog [ci skip] 71c532c15b Merge branch 'os370' of https://github.com/NREL/OpenStudio-HPXML into os370 c5eb879f96 No longer need C++ component [ci skip] 0aa37edc5c Latest results. 7da24eb032 Set kusuda properties to maintain consistency with previous models. 0e41aafe1a Latest results. 087655bbba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 de3ccd8f79 Latest results. ac336d81a2 Nope, needs to be higher. 2e648144dd Fix CI failure. Attempt to revert back to original unmet hours tolerances. 3a080c0643 Merge branch 'incident-solar-multiplier' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier b216cc3a81 Merge branch 'os370' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier b07b5ec370 Remove warning exceptions, update Changelog.md. e61a17a1b2 Merge pull request #1504 from NREL/os370_pilot_ems 192783217c Latest results. a4546922ad Latest results. 0bd27fc117 Replace boiler pilot EMS program with new E+ 23.2 capability. 774745bed6 Merge branch 'os370' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 1a5804cd7c Latest results. 3e867a7d61 First try w/ CI tests 7388b40e98 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 2b8df30eb4 These files now run [ci skip] 015b674714 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 4ca78220e0 Another newly deprecated methods [ci skip] 3fdd3ffd4a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 bda7958512 Switch from some newly deprecated methods [ci skip] 436d5a5b3f Update measures 40ed081ff7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370 0d9d31410c Latest results. 59ef8d62ad Merge branch 'os370' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 9bcc9f75eb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier fd50873bb0 Merge pull request #1477 from NREL/os370-vol 5433a306b5 Latest results. 23a7ee05d6 Try removing warning exemptions ea3a1c3560 Hardset space volume so we avoid autocalculating it. 307ec00d1f Skip a couple tests to get the CI happy 488d2fd3dd Latest results. 4aac7fc526 Revert XMLValidator change 18df4d3c6f Try to get everything running on CI 00f9921e77 Oops. 0f82902240 Skip another warning for now. 6986346f28 Address OS SDK change, exclude new warnings (for now) 5e218b5d14 Remove OS temp dir collision workaround 74578a8f18 Remove component load workaround 369b7b63e8 Bump to OS 3.7.0 9dcb99b6ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 43abcae290 Latest results. add67e1b56 Disable asserts 2fa4ded5ce Bugfix. a9ba6be248 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 070921d476 Latest results. 4337477d82 Don't need this anymore. 46ebbc696e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 1c4204469e Latest results. 9deed4aead Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 878134edea Latest results. 04f97bcd2f Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 58a81f60bf Latest results. 3cce4f9e3f Increase tolerance. 9932fb1689 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 3dddbc5fcd Temporarily disable asserts. 842f85f326 Merge branch 'os350' of https://github.com/NREL/OpenStudio-HPXML into incident-solar-multiplier 76be502b06 Code cleanup. 4e4b65ac67 First pass on implementation and updating tests. git-subtree-dir: hpxml-measures git-subtree-split: 506f8f9b01c79c9db4c46fb89403ffa8ab48eebd
dd8a2ce302 Merge pull request #1510 from NREL/hvac_sizing_bugfixes 45e5c5beb7 Merge pull request #1512 from NREL/hvac_sizing_bugfixes_maxload_oversize_limits d00a792b11 Latest results. d58194f105 Improve HERS sizing methodology, add more tests. d1d27255f9 Merge branch 'hvac_sizing_bugfixes_maxload_oversize_limits' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes_maxload_oversize_limits 3ebeee031c Re-enable asserts 491bb0de3c Latest results. 7d5751b8c6 Merge branch 'hvac_sizing_bugfixes' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes_maxload_oversize_limits 44711b0ecf Latest results. bda84481da Update CI job dependencies so that HVAC autosizing unit tests are always committed to the repo. 111c73ae58 Merge branch 'hvac_sizing_bugfixes' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes_maxload_oversize_limits ba0bb787e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes 0497a0d6ad Merge pull request #1520 from NREL/expand_hvac_autosize_tests 71af4e9d9e Latest results. 7a4b215a8b Temporarily disable checks 474936888a Expand coverage of unit tests to include Houston. 2ae3c3a01a Merge branch 'hvac_sizing_bugfixes' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes_maxload_oversize_limits 33642d8277 Expand coverage of unit tests to include Houston. [ci skip] bd8f16dccb Update Changelog.md [ci skip] b6d0933831 Latest results. fd5c89d992 Fix names in CI artifact 86dd668032 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes 568a20e8dd Latest results. 4616c794df Merge branch 'hvac_sizing_bugfixes' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes_maxload_oversize_limits ff5e8c72fc Latest results. aaecb6a73e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfixes 58c0c6ffe3 Latest results. f750074a64 Latest results. 437862244e When using the MaxLoad HP sizing methodology, the oversize limits for cooling should still apply. fecb9ba3b6 When sizing ACs or HPs for cooling latent load, ensure equipment is not undersized for sensible load. Also applies airflow cfm/ton bounds more broadly. 67dfaa7e59 HVAC sizing bugfix. git-subtree-dir: hpxml-measures git-subtree-split: dd8a2ce30246ac57e44f21a08113f75d60c5298f
…latest-os-hpxml # Conflicts: # Changelog.md # docs/source/workflow_inputs.rst # rulesets/tests/test_enclosure.rb # rulesets/tests/test_es_zerh_enclosure.rb # workflow/tests/base_results/real_homes.csv # workflow/tests/base_results/sample_files.csv
acf6f83af7 Merge pull request #1524 from NREL/mains_refactor 4650367c1c A little more cleanup. 1a21de4f94 Some refactor of the code related to mains water temperatures. Added unit tests. No diffs expected. fe41f908b2 Merge pull request #1515 from NREL/hpxml-v4-rc2 6c7b95b33b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpxml-v4-rc2 1b7fdfadaa Update Changelog.md [ci skip] e2d970c1d4 Merge pull request #1475 from NREL/ground_temperatures 3fa726c310 Latest results. dad3635b2e Some refactoring/code cleanup. Expand use of unit conversions. c2ee8992fb Latest results. 1256d24ec4 Use the adjustment value for sizing bore length. b98b24edd8 Merge branch 'master' into ground_temperatures 5f73cd14b1 Merge pull request #1519 from NREL/measure_readmes 24e144863d Clarify measure outputs. 377e7dda43 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into measure_readmes e55d56f258 Update Changelog.md [ci skip] e9bcb8f210 Add measure README.mds. Automatically generated from README.md.erb templates when running openstudio tasks.rb update_measures. 1cbbbefc7d Latest results. d64e263b04 Merge branch 'master' into ground_temperatures db33a31f16 Latest results. 1ba8f887cf Base borehole length on appropriate monthly ground temperatures. e138fe5293 Pull in HPXML v4-rc2. 61c4f64f8d Update the changelog. [ci skip] d3eb3c4786 Comment about the ground temperature regression coefficients 3a91f49246 Merge branch 'master' into ground_temperatures f409f236af Update a few enclosure and weather tests. 5f8486ba58 Latest results. c49b1724e1 Merge branch 'ground_temperatures' of github.com:NREL/OpenStudio-HPXML into ground_temperatures 75e61c7ff5 Pull undisturbed adj into existing ground temp method. 5eb2120a80 Latest results. 4d5632e13b Undisturbed ground temps vary by TMY. 3a70bf4977 Merge branch 'gshp_fanpump_adjust' into ground_temperatures 21e9062690 Latest results. 9195f57757 Add a weather test for checking all iecc zones. 0f05b45431 Add hvac_sizing call to get undisturbed ground temperature. 7c7096ac7f Add ground temperatures csv table. 6c42705d05 Add method for getting undisturbed ground temperature from table. git-subtree-dir: hpxml-measures git-subtree-split: acf6f83af71ef52b073dea4ac520693f252512f5
4127a5dcb4 Merge pull request #1536 from NREL/split_workflow_tests 00b8d21b99 Remove old files. [ci skip] fd88b9696c Latest results. 004c05172b Fix CI failure d2a87c7e3a Update pull_request_template.md [ci skip] ab259ce187 Split workflow tests, so they can be parallelized on the CI for faster turnaround time. 4d634565bc Merge pull request #1456 from NREL/whole_sfa_mf_models_unit_multiplier dd97163b14 Latest results. cfcdcd8d38 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 61a41f2c9f Remove a few more unnecessary sample files. 6f33b34af4 Latest results. 0cb03bdb56 Fix CI. 11c321e7af Don't write Building/Site element when not needed. b159db6a6f Rename more sample files for clarity. 326d947275 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 1d6ffc2b22 Add base-multiple-mf-units.xml sample file. Rename base-multiple-buildings.xml to base-multiple-sfd-buildings.xml for clarity. Fix CI tests. 0227ed5e39 Latest results. c646b84651 Address more FIXMEs, remove some more unnecessary sample files, speed up workflow tests (exclude real homes). 2c7185063a Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 4ed175e57e Address some more FIXMEs. d3f54ab5fa Remove some unnecessary sample files. 2ec7515e68 Latest results. 44976111ea Fix mechvent preheat/precool test. 82faa225b2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a1395a187f Latest results. 9272388f63 Backport bugfix. 8b9a9e28f1 Update expected test results 6471ae75cc A couple bugfixes, lots of cleanup, docs/changelog updates. cc37bc3411 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a689e46617 Merge pull request #1532 from NREL/low_flow_fixtures ca4fa03864 Latest results. 81ed09b8d8 Allow `WaterFixture/FlowRate` as an alternative to `LowFlow`; hot water credit is now calculated based on fraction of low flow fixtures. 8d481de9fc Latest results. 144ababc12 Bugfix. b0c5c382a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 5d25dc9c56 Latest results. eb7ed26425 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 0fe28b0046 Merge pull request #1503 from NREL/whole_bills 6d833e2518 Refactor a few things in bill measure. d4b3f1ea20 Create a has_fuels method at hpxml level. d7a214ed92 Remove random seed arg from tasks. d4fae980c4 Remove local extra_files folder and update measure xml. 6ac4809668 Merge branch 'whole_bills' of github.com:NREL/OpenStudio-HPXML into whole_bills 4c4fbf28fc Look for bills in special multiple_buildings test. 0a4e92b905 Latest results. 7c8d5b0756 Collect, and move up, pv systems. 3a218edaf2 Update message in translator test file. 73b5a277b0 Add a test for throwing new warning. b8e853a56c Initialize has_fuel hash. f4ac28e27d Move has pv up. c9b08a3748 Check for pv across all buildings. 608ad9d114 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_bills 6fe715389d Latest results. 3d9a2b7663 Latest results. 22546bad3a Merge pull request #1501 from NREL/hvac_sizing_tests a3935eb14f Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests 648d796e89 Fix multiplying by number of units. 6eb7fc8ddf Refactor schedule measure to operate on hpxml doc. d35c39f3a4 First cut for support simple bill calcs for whole buildings. 3461e53938 Add multiple buildings sample file with bills. c9b2c376d5 Use hpxml ctor error check on building_id. c2d7cb9ce2 Merge branch 'master' into whole_sfa_mf_models_unit_multiplier b6fd48e5c0 Latest results. dd0aae67bd Merge branch 'hvac_sizing_tests' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests e88db546d5 Update failing CI tests. 96513753bf Latest results. 0dc595f199 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests f83826e680 First pass on replacing HVAC autosize simulations w/ unit tests (for speed reasons). 5c1899ed6d Merge branch 'master' into whole_sfa_mf_models_unit_multiplier 4996844995 Update build measure to check more on emissions scenarios. 5c6ea0711a Show bug by assigning emissions fuel units in base-sfd-header.xml. 7b19de7cd6 Need to check number of buildings here too. Pointed out by @joseph-robertson 255fa708b5 Merge pull request #1457 from NREL/build_whole_sfa_mf_models_unit_multiplier 807e7465c7 Few review items. 3a8d55b554 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 3682e332fe Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier fe46a5e09f Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 4ee7943a3a Latest results. b63b0b8e6a Latest results. da13ed33f6 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 340080c2be Fix CI failure 0c8459b1d5 Bugfix. e8084e0c17 Bugfix. bad31f76df Bugfix. 4fc424efb0 Revert. 6ff05d8315 Add error-messages around building features that are not supported. Re-enable more tests. b97017bd50 Change a value for bad emissions scenario file. 72332831c7 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 0c7f5957cf Allow emissions same name but different type. 5bd8622706 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 4902b2839b Update same emissions scenario name in sample file. 7f6a43b6e9 Update logic for catching header issues. 6bee34ee7c Possible merge conflict in tasks.rb. 17ce9978ee Refactor error checking on hpxml header inputs. 777c469605 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier e9f3c2c1f0 Latest results. 5205e1889d Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier b101c77b6c Bugfix. 8a185d891a Latest results. f1a03366f2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 88f797203d Fix tests. 9b4a761d77 Moves some elements from SoftwareInfo/extension to BuildingDetails/BuildingSummary/extension to allow variation across MF dwelling units. 7e85203cae Fix CI failure. 1606aa31c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 2d79faf67d First cut at errors for conflicting header or building inputs. a28777224d Clarify new argument and add more description. 27c8a79b1b Clarify test. 4fb3faf390 Merge branch 'build_whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into build_whole_sfa_mf_models_unit_multiplier e8c49e0f85 Remove need for base-two-buildings files and call BuildResidentialScheduleFile once for each building unit. 0b604eb8f7 Revert comment. [ci skip] c407654cd5 Clean up. ec6519a385 Add comment about deleting extra SchedulesFilePath. [ci skip] 10170eb1cb Regenerate both schedule files from new sample file. becc012fcb Actually add two buildings sample file with different detailed schedules. 7a95206671 Create a new sample file of two buildings having separate detailed schedules. d9d57f6578 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 36c3b08376 Merge pull request #1478 from NREL/whole_sfa_mf_models_unit_multiplier_schedules 0504e74662 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier_schedules aaabb6922a Remove obsolete code. 00a53dc1f9 Remove battery losses EMS output var and use other equipment object directly. 449e690b70 Latest results. 4b6e05d75d Few more updates for the deprecation. 998b658ea1 Deprecate hpxml header location of SchedulesFilePath. 98d91cf8a6 Respond to review comments. 2d3e5b12a6 Update validator and ruby error messages test. 693c7aa5f4 Update docs and epvalidator. 816536fe0d Few fixes in build schedule file tests. 4d28cc0b0c Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier d1dd11fb31 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules d8c2883bce Does this help? d76e39f3b9 Probably won't help, but no need for these to be global vars d10f149d20 More debugging 46fb2cf20f Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier d4e9fc6e42 More debugging c54d757fab Latest results. c361087bad Revert to OS 3.6.1; trying tests w/o parallelization 601d0c9a22 Update for OS develop a51d78e159 Resolve merge 0978d7dd4c Update for OS develop af8081eda0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 696eef19e6 Try develop ee18aabdc5 A little more debug 77bdf2d4c9 Debug 565a6f027a Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f6f2ec4528 Revert to full tests fc8db4b921 Latest results. c8a2b3a09b Improve stratified tank UA calc. Some refactoring of schedules to reduce global variables and avoid a ScheduleFiles::set_unit_model method. cfcbf6bcef Fix CI? d4c2452d57 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 9002ccd9a9 More progress on DHW. Stratified tank (non-HPWH) and solar test files now pass. 5ce2817145 Add error message 5180896bad Update `HPXML::has_fuel` method to work with multiple Buildings 50a2293b6b Latest results. 1a21f2e7b9 Some code cleanup/simplification. 32e5d6cb81 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules f8082a6b20 Append in.schedules.csv int only for 2+ buildings. 3363579239 Add error-checking if unique objects have different values across dwelling units. 7b84afccca Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules fced723573 Updates for schedules filepath backward compatibility. 3858f3940c Attempt to address meta_measure.rb FIXME 0ff590cc48 Carry building_id to schedule file measure in run_simulation.rb. 6b46d321b8 Updates for bldg header and schedule variation across units. 3612308b82 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules 966a5a6991 Update schedules and validation test files. 11f5ffa33c Update expected warning bbc25749e1 This FIXME has been addressed. e9e7595c35 Provide a warning when NumberofUnits is greater than 1 04a9d186eb Revert removal of the unit_model workaround. 74ad7beb6e Introduce new building_id argument and test it. 0e0978686f Updates to schedule file measure for multiple buildings. 3608f7ef79 Update build schedule file measure and tests. 039b9acc47 Regenerate all sample files with schedules filepath. 64df290a54 Update build measure to write building level schedules filepath. bb6995a02e Create class for schedules filepath at building level. 179eb3a6a7 Latest results. fca555c836 Exclude file w/ battery. 398a079227 Add timeseries test asserts for 1x vs 10x results. d395572ae4 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 8e9a50696d Timeseries airflow outputs now work. dbf8fbe02a Latest results. 9daa31e673 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 8c4a1b0395 Enable more test files. 61f1a57ff4 Latest results. 808381f766 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier bdbcddd1d6 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 6f32530cf4 Enable more test files. 379d9e765e Latest results. f352117214 Fix CI error; this seems to be a better solution than the previous hack. d64bf86a9a Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 70029045cf Latest results. 81ebbc6f48 Address duct losses. d9fc66acc5 Address GSHPs a97a58c10c Latest results. 1c2ef6dfff Skip another battery file. 2c4f0ecaba Fix CI failure 2109812b48 Update HPXMLs 34249402da Exclude batteries for now. da32377dcb Some code cleanup and minor bugfixes. 6e49026dbb Increase unit model shift to reduce possibility of shading 18f32ca6a4 Bugfix. 22ed937b97 Avoid setting unique ids on the first building element. 97b09ec628 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 686567ad5f Backport Joe's bugfix. 1bc97a1139 Fix CI error. 8bb3af6888 Latest results. 21c1d9f323 More advanced stress test. Rather than running the one HPXML Building with a 10x multiplier, we create two identical Buildings, each with a 5x multiplier. e7014938c9 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 0bb3503b46 Oops. 25b3d9ee47 Latest results. 581ff50228 Address unit multiplier for batteries. 867d244aeb Fix merge. 6ed0c43308 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 0dd6be8bda Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a4072e7562 Add extra build measure tests. ecdfd3bde8 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 7823911ce2 Latest results. af530fec35 Fix unit multiplier tests for PV, generators, and mech vent. 01b292fccb Latest results. 01b6e96fbd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f1da02990a Add tests that compare results of sample files against the same sample files with a 10x unit multiplier. Fix unit multiplier for more building components. 129f367c92 Need to ignore shading_id attrs. ff3aed8252 Remove debug line. b0430c9f76 Validate files created in build measure tests. 8c95d15f69 Handle all buildings from workflow tests. 8ceda701c4 Set unit_model on schedules_file instance. 692f9aeed6 Avoid hardset of site id and shading ids. 50b4970af3 Remove clothes dryer from first building in sample file. 2590ba7ad7 Try multiple buildings with detailed schedules. 9892558099 Avoid duplicating bill scenarios. d05086b64a Make SiteID variable to avoid overwriting it. ec313d7fb8 Update sample files. 9cd85ce62e Update build measure to add buildings to existing hpxml file. 89732f2cb8 Small bugfix [ci skip] d4af087d88 Update ReportSimulationOutput so that more outputs are for the whole MF building. Still need to fix and double-check some things. 0d61bd1a0a Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 77c49d4edd Fix CI failure. e347a970d7 Latest results. 93b757ce2e Update in.xml to reflect the entire HPXML file when using `-b ALL`. Let's see what breaks... d6c8a73ec2 Fix a couple more tests. 88626d65d5 Fix lots of CI tests 3ca3daaf77 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f8616b21b7 First pass on expanding HPXML class to support multiple HPXML Building elements. Not everything works yet, but many things do. 16acfc6cf2 Latest results. ef3e4c470b Bugfixes. 9501aef175 Fix possibility of missing tmains schedule. Fix boiler pump energy. 83da1fc485 Improve water heating and tank losses 712883a302 Merge bugfixes. 02905d38b8 Address heat pump backup. c731a179cf Merge branch 'unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier c5ad64cdea Fix CI failures. b99c32cef0 Bugfix. 9b4f957fa9 Fix water heater EC adjustment and boiler pilot light. 4e7d16abec Progress on appliances, lighting, water heating, component loads. Fix cooling. 8b64ec6a74 Apply it to all thermal zones (probably doesn't matter for unconditioned zones, but matters for duct zones). efe6d818e2 Step 1: Use E+ zone multiplier. 0534a62ff1 Fix CI error with a different hack. 2fe693ac9b Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 2c1ffcb1cb Fixes CI tests 1d41b521ea Some runtime improvements. f1839d1624 Latest results. b15d861d80 Prevent overeager EMS renaming related to 'foo' and 'foo_1'. feb60267dc Fix typo. 7b100bd1f4 Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 07f0ae43ed Avoid using object names to infer the building feature. Other misc cleanup. ce90c7e522 Latest results. f29e242ab6 Latest results. a024f270c8 Bugfix for no ducts. cf7820ed1b Bugfix for loads calculation when there are multiple duct zones. 019df591db Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 9ad2cbfa49 Fix unmet hours. 1879b8d2bb Latest results. 09abfa44f5 Bugfix. 6399212aa8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models cbb8ff9be0 Bugfix. e844624989 Address total loads, component loads, and unmet hours outputs for whole-building models. 42363adc59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 22efeb8794 Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models feaad3e9d6 Port over unit geometry shifting. 834961bb36 Latest results. fd5ca970ed Fix CI tests, maybe. 6e8523fdb4 Bugfix; only process weather once for faster performance. 1cfeb80e2d First pass on being able to simulate whole SFA/MF buildings using code prototyped in URBANopt. git-subtree-dir: hpxml-measures git-subtree-split: 4127a5dcb4a50c7f318a4d59054addc9b15d91ab
51f9d2fde5 Merge pull request #1537 from NREL/ground_temperatures2 c45fa9de0f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ground_temperatures2 6598ab6059 Merge pull request #1539 from NREL/fix_system_use 053e9130f2 Fix CI failures. 5428043749 Run update_measures. fb2bf8fb80 Merge branch 'ground_temperatures2' of github.com:NREL/OpenStudio-HPXML into ground_temperatures2 4063887f5d Accept nearest station in xing lookup. 9d9ad3647d Add comment [ci skip] 1043ac2d1b Fix comment [ci skip] 2b0d89bf4b Fix possible incorrect value for system use, bug introduced in #1456. Adds error-checking to prevent this going forward. Some other minor misc cleanup. d4ed83b668 Merge branch 'ground_temperatures2' of github.com:NREL/OpenStudio-HPXML into ground_temperatures2 54d28d2ce6 Skip deep ground temp calcs if no gshp. b00bb92403 Add test for defaulting xing values. 3a783ad4a2 Respond to review. 23f6e542ea Latest results. 71ac84dff4 Merge branch 'master' into ground_temperatures2 98ace8d4ac Update the changelog. [ci skip] 9cd53e49d1 Merge pull request #1538 from NREL/misc_cleanup e24568fd74 Latest results. 951dc93344 Misc cleanup. 092d498141 Latest results. 3370a53432 Convert new csv to utf8. cde1f9aaab Get the units right. 27148f692c Missed a return. 533d2926d7 Update the changelog. 4a6174d571 Assign deep ground variables and use throughout. 1fbc708756 Add deep temperature lookup based on xing model. 6c91ec33ac Revert shallow and deep ground temperature conflation. git-subtree-dir: hpxml-measures git-subtree-split: 51f9d2fde585ea14ad1b46c13cf81e67d567af13
0f813a83fe Hotfix for recirc energy when multiple water heaters. git-subtree-dir: hpxml-measures git-subtree-split: 0f813a83fe1db30ae998df981463825b9ab3c8f3
2022425e5e Merge pull request #1527 from NREL/1_and_2_speed_hvac_regressions d5d589b4d6 Latest results. 49691011f8 Fix conflict resolution. af0388c962 Latest results. ea1e7f021d Update Changelog.md [ci skip] def58da859 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into 1_and_2_speed_hvac_regressions d741ae7421 Merge pull request #1317 from NREL/heat_pump_detailed_performance 10f45058ec Latest results. 983a79ddbb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 87bfe1aeb9 Merge pull request #1552 from NREL/speedup_ci 1359e4509d Bugfix. a226ff5081 Speed up measure tests for reporting measures. 6154439614 Small docs change. Moved building scope description into a new HPXML Building section. [ci skip] da1d80e092 Merge pull request #1550 from NREL/whole_mf_timeseries_temperatures 10488e3ae5 Fix missing timeseries temperature outputs when running whole MF buildings. Add test. 22d9e4df6a Merge pull request #1548 from NREL/foundations_with_walls_only 6f6304820e Latest results. 3deebd8322 Update docs [ci skip] 483ffcbf4f Add test file. d62712830c Allow above-grade basements/crawlspaces defined solely with Wall (not FoundationWall) elements. 319f860c55 Merge pull request #1543 from NREL/build-res-hpxml-doc-defaults af0b8c6701 Merge pull request #1544 from NREL/docs_formatting 111190f269 Fix a few typos. 7d0241f962 Add dashes to the rest. [ci skip] ee7c106c15 Test [ci skip] d29c06dba7 Try unicode character to preserve dashes. [ci skip] eef6530068 Use paragraphs in footnotes to work around readthedocs/sphinx_rtd_theme#1472 2cd420ca1e Few more href updates. 445d7a40a4 Replace all measure descriptions with href. baccc92931 Latest results. 6daa7ce3a5 Test [ci skip] 529975bb3a Test [ci skip] 4b4903fdfe Test [ci skip] 1f8868465e Test [ci skip] 356f1e743c Test [ci skip] eb328e35be Test [ci skip] 0605b62d89 Attempt to fix docs formatting, which changed in recent weeks. [ci skip] b883767639 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into 1_and_2_speed_hvac_regressions adc2d8fd3e Latest results. a2fcdf2c80 Update readme erb to convert href to markdown. 1c6fd3dce4 Try an argument description with href. 455a0d719d Use sizing speed more places in hvac_sizing.rb. Update tests. 8c77d5930b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 3e68033aab Merge pull request #1526 from NREL/ducted_mshp_sizing 31b63e9722 Latest results. fae91e3323 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ducted_mshp_sizing 8bfc8c4eb3 Merge pull request #1541 from NREL/balance_workflow_tests f16d845e89 Merge branch 'balance_workflow_tests' of https://github.com/NREL/OpenStudio-HPXML into balance_workflow_tests e44ad71caa Latest results. 46007f49b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into balance_workflow_tests 5aef27a6ae Merge pull request #1542 from NREL/fix_msgpack_hourly 0656b5a521 🤦 080a843adc Update tests and misc cleanup. e4788c4f5a Update build measure argument descriptions with links to docs. f4fcb5a921 Missed one update. 1e59ff5253 Fix use of hourly msgpack file. Hit this error in a BEopt test now that most of our end uses are derived from Output:Meters instead of Output:Variables. 3dd4cba484 Better balance the runtime across the two workflow CI jobs. 02207f7a83 Merge pull request #1540 from NREL/deprecation-msgs b251c34b73 Adds error messages for all extension elements that have been moved/deprecated since v1.0, so that the input is not silently ignored. No need to do this for non-extension elements since the XSD Schema will report errors for these situations. d9348692a1 Latest results. 218dba39a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 5889de415f Update unit tests. 08087e56e1 Latest results. 91b20b687a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ducted_mshp_sizing 933cf8ce1f CLean up changelog [ci skip] bf81fc0b78 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into 1_and_2_speed_hvac_regressions ebdd135e61 Latest results. 63caade040 Latest results. 416713c6ad Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into 1_and_2_speed_hvac_regressions b55b4d78ec Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 939d869324 Latest results. 57c6489c3f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance aeb696f579 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance a8a4c135a3 fan_speed_ratio and capacity ratio override ecb5f33bb5 Latest results. 7448398a77 Revert change to MSHP rated fan power. Small tweak to max_cop_82 for ductless systems. 0d6450ef1c Remove deprecated variable. 20534a4387 Latest results. a23d0d1a21 Small tweak. 2eb32c4d15 Replaces inverse calculations with regressions. Renames variables from EIR to COP. 8768fdd2d4 Latest results. a890bb11c5 Merge branch 'ducted_mshp_sizing' of https://github.com/NREL/OpenStudio-HPXML into ducted_mshp_sizing db9528575b Add airflow rates to CI artifact. 3e23593344 Latest results. 2b7363b382 Latest results. c7d71f7066 Bugfix. 790b177584 Treat ducted MSHPs like ASHPs for equipment adjustments in sizing. 609f2d3553 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance e05e32269b Fix GSHP test failures and cleanup code. bd656f94cc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 766132a433 update_measures 9ece063a57 add nominal speed in sizing, restore get_sizing_speed ed5b6f0395 Latest results. 89a7d03b2a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 0c0cac417f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance c65b59f5bd Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance bf9f8fa1fd Get rid of additional_properties.num_speeds and other cleanup. No diffs expected. ba2c6a687d Latest results. 40b5b96c12 Bugfix. 05fca76f0b Fix fan ratio calculation. d92e6d0a81 Update unit tests to handle new sample files. 447b7e3bde Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 247650e36d Fix rated fan power in net-to-gross calculation for cases not using detailed performance data. Create method for calculating fan power using fan power curve. 09c86473c8 Update unit test expected values. 5e2d440844 Latest results. 1e88e8a1e5 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 4c2df0d69e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance c3988289cd Fix rated fan power in net-to-gross calculation. dbdebba3e9 Latest results. 18b2784d94 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 2f61112118 Latest results. a544b0fdef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 1bd8bb72a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 22871b732d Set fixed rated W/cfm for ductless systems. e4a8120485 Revert use of Table:Lookup for constant values. No diffs expected. 5809cacffe Latest results. fa21b59b1b Use adaptive step size tol of 0.1; gives results very close to using 0.01 and had no discernible effect on runtime speed. 6ab4baa383 Latest results. 3bcc25dadf Latest results. b2b89b8f2a Simplify HVACSizing.apply_hvac_fixed_capacities method and minor code cleanup. Diffs only expected for files with detailed performance data. 0eea8a06e1 Simplify/merge code related to capacity ratios; no diffs expected. f89ba7f01e Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance ab9f6ff2ee Expand sizing tests, and a little cleanup. 7b6da1096e Latest results. 7e98f95406 Update ductless max_cop_95 coefficients 6df3dea8b4 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance b506ceb846 Need to protect from negative lookup table values on the other end of the ODB range as well; found while modeling a NEEP product. No diffs expected. 30279ccd2d Latest results. 7d91061582 Use constant extrapolation 18a0ddc577 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 4c029939f0 cleanup for heating 48b9ae5a00 cleanups on hvac sizing 60c7876817 Latest results. 0f2c7adb0d bugfix 71f2b28a35 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 2e03763de3 allow increase capacity for detailed performance data inputs db4a5972aa Latest results. ba031a0c1d Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 4f5a98a82d Create range bounds for independent variables that prevent negative Table:Lookup values and add some error-checking to ensure we aren't creating Table:Lookup objects with negative values. Revert from Table:Lookup to curve objects for HVAC system types other than those using detailed performance data, given there are complexities/risks/performance considerations to using them. 64a4c9bd51 hvac sizing improvement for detailed performance data, some cleanups 227dfb3b37 Refactor similar code into a single interpolate_to_odb_table_point() method. No diffs expected. 3feb77d145 Latest results. 597060828b Always calculate capacity retention factor at 5F when detailed performance data provided. acd24699a0 fix retention ci error aa9efdd2c5 adaptive step size first cut 2b552f6f18 oops, forgot to delete dead codes 3b2300d013 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance e21d6f201b hvac sizing heating retention adjustment and cleanup 88c7cf06c0 Oops. 152602f54c A little more cleanup. 1609f0a2f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 7e65a8751c Misc code cleanup; no diffs expected. 3bd9239a3d Latest results. 122b55a7e4 Add dataSource="software" to defaulted performance data. Remove default heating 17F datapoints, not necessary. a07ab12f8f Cleanup sample files; only need CompressorType="variable speed" for files with detailed performance data. ca8f765c00 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance d914a9a03d Latest results. 87a401538d Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 65f642ddce fix test for new default too f9eba73549 update the cop vs hspf coefficients 8bde279f32 Latest results. 2e72647cee Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 7a21680ce0 use compressor lockout temperature in table lookup 8274e22e74 Latest results. 09cb506a0b Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 4af6da1f2b change the heating rated condition 6051e80075 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 98ef4d3127 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance f6803ad243 Fix object names [ci skip] dcc3f59c6f one bugfix for interpolating f18a78d9c3 Latest results. 35d4abfb05 Latest results. 4355a1b08c Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 1e1a68ea12 add iq+detailed performance data test file e0c35ecfa1 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 2323edb5a6 Fix CI failure d8201192c2 alternative fix for iq 18029c3467 Latest results. 7b4bfc7d13 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance c47592293f Show heating capacity retention fraction in in.xml for variable-speed HPs w/o detailed performance data. Document new default for variable-speed HPs. Round capacities/COPs when defaulted in in.xml. 2aab954fbe add cooling capacity ratio from max to rated 9bc83c0a7f Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance ce4c29c347 fix iq issue 5ab446dc0c Require CompressorType="variable speed" when providing detailed performance data (for now, at least). 2ebf00caa0 Latest results. 180bf1568d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance e5a60524d6 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance bdb6d8f9e8 update wall placement cop correlation f346a3adcc Latest results. 6aa21d1f39 ignore shr warning for now, adjustment is small 4a7ebc84b5 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 4541de0a94 Fix one CI failure f50e6f92e1 fix unit tests for cfm/ton 5641df67ba This shouldn't be needed. 522140481a Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 09b8bceedf change cfm/ton to be 400 4d11f610f9 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 5d5f7ce1d1 Allow CompressorType input for MSHPs/MSACs (though it has to be variable speed). Previously we just ignored the input, but now we will throw an error if a user tries to model a single/two stage mini-split. f0683ee953 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance dd3f3df38d simplify constant table lookups d0f20ae6de Removes HeatingCapacityRetention from HP sample files, since it is ignored. Also moves some sample files properties from tasks.rb to hpxml_inputs.json, so they go through the BuildResHPXML measure. 649eb8bed7 First pass on docs. Minor hvac.rb and EPvalidator.xml cleanup. 350cafabc8 Fix order of elements in docs. e787345881 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance d1f197b495 Latest results. 28bb9d36bf method name issue 48a9031f2c remove one comment a2b189eabf Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 12135044d5 modify hvac sizing adjustment based on new approach, remove var speed system ft curves 63fdc9a63d Latest results. c36a208e2f deprecate hspf and seer calculation methods for mshp 393752c864 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance d04cfa248d fix unit test, add performance data unit test e652831243 Latest results. db9c77907f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 35a61e18a9 report user-entered rated capacity instead of maximum 7c88b12b0f fix air flow using rated capacity. Add rated capacity as required input for reporting e65789c1b6 revert cfm/ton 74c4288ebf Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance c443d6d82b fix the order issue, deprecate one more method, add some comments be86579754 Add error-checking and tests for incomplete datapoint pairs. 46fff77511 more flexibility for detailed performance data specifications 5a38d9090e add cop from seer for centrally ducted system 663bfde977 change the method to ensure nonzero capacity for detailed performance data 8c6174957f enforce heat pump cooling and heating detailed performance data to be provided together, allow ac detailed performance data inputs 882ae0002a Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 05238285e9 progress on cooling defaulting implementations 88e752cb78 Latest results. 981161065f add ac test files bcbf0f02f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 06280319d4 use HPXML constant instead of hardcoded string 955826cbf7 change tests too 7c20721c7b address comments 09eb9a539e Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance e0312e7e01 fix test default for new defaulted capacity retention of var speed systems 36d044a175 Latest results. c953e2cea4 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 82e48e955f fix unit test, handle capacity retention inputs for 1/2 speed systems, handle capacity net to gross conversion for all dx systems b3286c4113 Latest results. cd44b313e7 fix cooling only case e9493c7124 fixed a few bugs related to 17F capacity and capacity retentions, added unit test for overriding these two inputs when user provides detailed performance data c40dd0a0a0 remove top level capacities for detailed performance data test files 8a1034df4f moved the default neep data method call to be after hvac sizing call 05b2bd723b change user input capacity to be rated instead of maximum f1eef4900b fix autosize error 5919424857 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance ae08520663 small fix 011233a924 heating default methods added 2f01ebcfb0 remove unnecessary data structure c0e0d8a853 put two fixme comments for hvac sizing c6faa2dddd connect performance table for heating 98e5764b1f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 6239d9ee1c bugfixes fad91b6d3d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 63b01994a1 connect to table lookup 3e6ae519a9 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance ef1015600b progress 6b8be82e15 Latest results. ed102a8ef5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 8f116be452 A few refactors, add interpolation, add correction for indoor conditions a65da73730 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 5ec0d4ef56 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 173c3e04a6 added convert_net_to_gross method 2f3aad7f61 Latest results. e0114e99d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 9286bfcfd2 Latest results. 02ef16859a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 8e4d8f883a Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 752cb34df0 save progress: added clg/htg ap data structure to store neep inputs, added placeholder for methods 13cace3efe Latest results. 45d917f305 fix bicubic calculation coefficient order to be the same as E+ coefficient order a273166c60 change variable range for boiler 79a4a8899d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 7f1e6dc36d fix installation quality program and remove calc curve methods fca5410f6b update hpxmls 06e249f812 optional parameter 55230694f3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance a6ea560387 cleanup and more curve replacement e4f24eace5 Merge branch 'heat_pump_detailed_performance' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 280ed3689d Latest results. d93d8b929c Drop support for CapacityFractionOfNominal elements; lets keep things simple for the initial implementation. ebe25380da Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 29d3ecaaa4 first cut for table lookup, not completed 88f279dc39 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance fdd18943a1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance d93bc6ecf4 Latest results. e66bd05b54 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance f8d72f4e58 Latest results. 01edbccc4b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 63f1cf7f75 Latest results. d69dd9b41d update_measures 515b64deb3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance c721e70c73 Comment [ci skip] 0f45b677a3 Latest results. b4bf80cf6e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_detailed_performance 44ed0dbc39 Bugfix. 41efcfd543 Bugfix. 9bf1fd0585 Add inputs to HPXML class and Schematron. Create sample files. git-subtree-dir: hpxml-measures git-subtree-split: 2022425e5ee467e1f5d37537f9d7ec0e55dbd9db
…latest-os-hpxml
e9a227ea2a Merge pull request #1553 from NREL/var_spd_hp_bugfix 72c39ab5f5 Fix error if detailed performance data provided and some capacities are zero. d861ab043c Fix docs formatting [ci skip] git-subtree-dir: hpxml-measures git-subtree-split: e9a227ea2a154dbafdbc81dfc1a57d19da265af3
5b26ce2e9e Merge pull request #1380 from NREL/schedule-file-rel-path e36131b931 Update xml 2e37282b95 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule-file-rel-path 1478dc42e6 Merge pull request #1559 from NREL/fix-hybrid-spelling 0559c45bc4 Merge pull request #1560 from NREL/os370final c967390143 Bump to final OS v3.7.0. 9a17f76651 Couple of places where hybrid is misspelled in the docs. 162ef4aa41 Merge branch 'master' into schedule-file-rel-path 8db786fe89 Merge pull request #1545 from NREL/os370rc2 b5f15f7255 Fix updating of reporting measures 56d5731554 Bump sha da6303bce2 Update for upcoming rc3. [ci skip] eb50907a10 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os370rc2 496f2406dd Fix CI failures. 64ba96c1f8 Bump to rc2. 516ab9046a Get config ready to point to develop. 8c8c6e4cce Merge branch 'master' into schedule-file-rel-path c861f372f9 Update schedule file relative path setter name. 346a99bc63 Merge branch 'master' into schedule-file-rel-path b7c93e44f4 Confirm new schedulefile setter does what we want. 355d8ed87c Add run folder to workflow json file paths so external file can find it. e658bde701 Merge branch 'master' into schedule-file-rel-path a2732cc32c This works with the os changes, but we are changing cwd. 77ceaf8414 Move abs to rel path conv to schedules resource file. e15c4ad624 Change output_dir to relative path. git-subtree-dir: hpxml-measures git-subtree-split: 5b26ce2e9ec042ad9397096a32accbe53a7cf20b
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Description
Working branch to test OS-HPXML as it moves towards v1.7.0.
New Features
PortableHeaterandFixedHeaterwithSpaceHeater.Bugfixes
InsulationSpansEntireSlab=true.CompressorLockoutTemperature==BackupHeatingLockoutTemperature.Checklist
PR Author: Check these when they're done. Not all may apply.
strikethroughand check any that do not apply.PR Reviewer: Verify each has been completed.
openstudio tasks.rb update_measureshas been run