Improved Enclosure inputs #198
Merged
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
Codecov Report
@@ Coverage Diff @@
## master #198 +/- ##
==========================================
+ Coverage 61.44% 62.09% +0.65%
==========================================
Files 33 33
Lines 18405 18270 -135
==========================================
+ Hits 11309 11345 +36
+ Misses 7096 6925 -171
Continue to review full report at Codecov.
|
…nd windows test. Some code simplification.
… a foundation wall between basement and crawlspace, describes the amount of foundation wall adjacent to the ground and below the crawlspace.
…v3_enclosure # Conflicts: # measures/301EnergyRatingIndexRuleset/resources/301.rb
shorowit
added a commit
that referenced
this pull request
Oct 17, 2019
9ba446d Merge pull request #199 from NREL/allow_tankless_for_more_bedrooms 6d5c4c6 Merge pull request #201 from NREL/cond_duct_with_lto 544c75b Merge pull request #200 from NREL/orphaned_ducts 072c151 Zero out duct leakage in a couple more files. f3af17e Bugfix. a24268d 0 bedroom edge case f1a1c39 When there is leakage to the outside but all ducts are in conditioned space, model the leakage as actually going outside. This can happen, e.g., for ducts in floor cavities which have leaky rims. 4549668 Give error message if a HVACDistribution exists but is not referenced. b8e6a45 fix runtime fraction error when tankless system serves more than 5 bedrooms 173919b Merge pull request #198 from NREL/wh_tank_ua_check 598dbc0 Merge pull request #139 from NREL/wood f6b0a8b Add error-check for negative water heater standby loss coefficient (UA). 9f55515 Merge pull request #197 from NREL/fix_test 5a2db6a Merge branch 'master' into fix_test 961ded5 Fix for wall tests not being run. 7f09be6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wood 9e0183d Fix test. 9c86a57 Some fixes, cleanup, and more tests. 8e8ba8b Merge pull request #196 from NREL/from_hescore 84742d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wood 042c1c7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into from_hescore d79d906 Merge pull request #177 from NREL/surfaces_check 86c76c2 Merge branch 'master' into surfaces_check 6c4d931 Merge pull request #194 from NREL/elec_parasitics f19b34f Merge pull request #193 from NREL/os290final ed39d1b Remove electric parasitics from furnaces/boilers; they are already captured in EAE. 200e768 Bugfix. 585ad13 Clean up ceiling vs. floor code. 84e7bf8 reverting attempt at shading factors for skylights 76c7226 Update. 59db6c8 Update logic. a200597 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into surfaces_check 8e91cdd Merge remote-tracking branch 'origin/master' into os290 6380751 Merge commit 'e91e6c70962bc0e1d0d416e071ba90d86a59b08a' into os290 7bcb78e Merge branch 'master' into bldg_config_townhouse 6c61599 handling nil interior_shading_factors on skylights 6ee43c9 using interior shading fractions and schedules on windows and skylights a209d2a Merge commit '98ba20f1cd0b5728fff0e03d5eea016d94981a37' into os290 87863a0 Merge branch 'master' into bldg_config_townhouse 4736630 Merge commit '950cf0f0c97540ec2310186fc344bd98e9804418' into os290 e05acd8 Update check for thermal zone surfaces. 5fe9062 Merge branch 'master' into energystar_upgrades 3e424a5 Merge remote-tracking branch 'origin/master' into energystar_upgrades b949aa8 Moves fan/pump energy from the circulation end use into the appropriate heating/cooling end uses in the output JSON file. aaab4e7 Merge commit '1a4f82f648677623a603d84abcd3b947e619fa75' into latest-os-hpxml 59871d4 adding energy star to water heating lookup 0a94b01 Merge commit '5b267dd3d1fc38a0c8246a686ffa64e4e702d683' into latest-os-hpxml 7651009 adding energy star to hvac lookup f3f62f3 Merge commit 'df28aae03a6e1d164b84e30b2fdc7dffc2e508de' into latest-os-hpxml ec8a709 rotating roof for townhouses af5816a Merge commit '11ddffd910fe3e5ac0f98faf37817542551dcfeb' into update_oshpxml e07edee Merge branch 'master' into update_oshpxml 3f149a2 adding comment about height [skip ci] 9863b4a updating hpxml to openstudio rakefile and xml files f982477 Merge commit '52f870561546e56ff74971d1cb8a9d60837941c9' into update_oshpxml 10d2ad8 fixing validation 64d7fa7 epvalidator changes 91e95b6 using unless one liner 8c11a80 adding neighbor height argument to HPXMLtoOpenStudio a7f8d60 Initial implementation to allow wood for heating, water heating, and appliances. 131e9d6 Merge commit '201281c8ae4e15df4106171a76ef10289df042d9' into indirect_water_heater ce5a100 Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HEScore into indirect_water_heater 5078568 Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HEScore into indirect_water_heater git-subtree-dir: measures/HPXMLtoOpenStudio git-subtree-split: 9ba446d
shorowit
added a commit
that referenced
this pull request
Dec 18, 2019
281d183fd Simplify code a little. [ci skip] 1802a2970 Added a couple more test files, updated one test file name. 527fd2813 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw b0f812fef Merge branch 'solar_dhw' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw f50bb7109 Fix for solar fraction applying to multiple water heaters; now checks which water heater it's connected to. Adds error messages and test files for combinations of 1) SHW + combi boilers and 2) SHW + desuperheaters. Updates documentation. fdab553f3 Whoops, missed a change for the dummy tank that was causing errors for non-ICS direct SWHs 71a1e8e5c Merge branch 'solar_dhw' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw e6a81aeed - Updates to the Copperheart ICS xml input file - Changing ICS systems to use the entered storage volume as the collector volume - Making sure direct systems that use a dummy tank always use the same size dummy tank - Cleaning up some old TODOs 94d5ffb6d Update hpxml.rb methods. 52c2ff608 Fix comment. ac9fdbd5e Reducing the # of covers for ICS (minor impact, but more correct for the ICS systems I've seen) and adding a test xml that matches the Copperheart CP-40 spec sheets c369b56c6 Merge pull request #253 from NREL/bsmt_slab_ins_bugfix 442380dc3 Bugfix for issue spotted by Yueyue. 743160c3a Better test file. a397f8a4c Fix for basement slab insulation not being used. Added test file. b1335f111 Add apply_solar_thermal method back in. fe789318e Update EC_adj retrieval after merge from master. 51c752d92 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw a02f02c86 Merge pull request #221 from NREL/dual_fuel_heat_pump 44af01d56 Updated test files. f171de896 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dual_fuel_heat_pump 1f169008f Ensure all fan energy is captured in fan heat/cool disaggregation program. Update backup system AFUE in test files. 788e5c190 Updates to the SWH model, including: 57f9f232c Merge pull request #244 from NREL/indirect_standby_loss ae9849bae Update docs. [ci skip] abe430670 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 7e833d009 Update docs. [ci skip] d5f4ea9be Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dual_fuel_heat_pump 1a9d83847 Merge pull request #252 from NREL/hvac_sizing_cleanup 81b6573ea Cleans up and simplifies some code in hvac_sizing.rb. c23bfd7a0 separate standbyloss calculation into method 16758c09d error checking combined f4cd43407 added warning to large standby loss, moved indirect jacket method call into ua calculation method 8f999c529 re 0->nil for tankless ua method call 4a884858d remove comment a5a1f96a6 int->float, one more clean up for jacket 3949c2c3f removed "unless" and reverted to "to_float_or_nil" in hpxml.rb 8fea77c74 Added error messages for improper inputs 3f77e7d79 combined standby loss calculation into one method 0824c6ac8 Merge branch 'indirect_standby_loss' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 7ad7e8b82 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 6f143c82b Some cleanups 95ea05bbf Merge pull request #251 from NREL/surface_net_area_bugfix 4ec325e50 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 942a1344b Bugfix for files where the area of a wall/roof is barely larger than the subsurface area. d650d7536 Merge pull request #250 from NREL/minor_stuff 8dc7e2cc4 Exclude LCC objects, add validation arg. c6f762b65 Merge pull request #249 from NREL/os291 6d94627a9 Switch to OS 2.9.1 c87f080b2 Merge pull request #242 from NREL/docs 5284a6614 Re-enable all tests. 809130c16 Fixes test? 69c516fdb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 3f0f80dac added comments for extension element 6107ef903 Debug. 327d69520 Add simple run_simulation.rb and template.osw files for use with CLI. Update docs. eb8fb7401 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs 4c17a3982 Merge pull request #248 from NREL/weather 4eea07d3b Merge pull request #247 from NREL/dsh_restrictions c107466bc Fix tests. 040939936 Oops, still needs to be a required arg. ecc2b1680 Allow EPW filename to be specified in the HPXML file. Updates weather_dir to allow relative paths and adds a default for it. f9f8a2727 Prevent desuperheater + HPWH for now. ca8ede6af Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_standby_loss 8c0cdb521 Added method to calculate tank areas. aef317b4c Merge pull request #245 from NREL/ducts c02054b94 Merge pull request #246 from NREL/from_hes a60cf7478 Remove obsolete code. 0d6e9dba6 Reduce a bit more. cae95f3e7 Some more documentation. Adds license. e1d83de61 Sync. e6d33948e Merge commit 'fbf1323a525edfa0563a2227a2abcd206c787da8' into latest-os-hpxml 2768dacca Some tweaks. 2d224fe54 UA, jacket, etc. only applied to indirect storage tank, skip those for combi-tankless. e0fb84352 Progress. 6ea6a7d2c added standby loss to ua calculation for indirect system, resolved interaction between new ua calculation and tank jacket, deleted indirect assumed ef and fuel functions, changed desuperheater preheat tank assumption directly with ua 845b53745 Move CFIS return duct losses to conditioned zone. Some code cleanup. 520dc1aba Added standby loss indirect sample file 7ab3d6bb2 Incorporate return duct losses in loads outputs. Fix duct losses in base-hvac-undersized.xml. Tweak duct parameters. 3c8eb0b09 Merge pull request #243 from NREL/hvac_sizing_bugfix 6f318fd26 Merge pull request #239 from NREL/workaround-desuperheater 06937f447 Bugfix. 7bab2d8ae Fixes HVAC sizing when the house has a conditioned basement. d0ba15de6 Revert some code. Turns out we need EMS output variables (for both load & energy) in order to get outputs on a per-water heater basis. 3db9bb20d Handle interaction between EC_adj and desuperheater. (Not needed when desuperheater object is used because the water heater energy consumption is affected, which in turn affects the EC_adj value.) 89e86f97c Switch EMS output variable to report load for ERI; energy can be obtained elsewhere. (Similarly, removed EC_adj EMS output variable because energy can be obtained elsewhere.) dc743eba1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into workaround-desuperheater 8ad7b8423 minor changes 7a8f8f427 Merge pull request #241 from NREL/detect_duplicate_ids 1de0c677a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into workaround-desuperheater 713b28f75 added otherequipment object for reporting; added E+ approach with label for switch 71fdd18f7 Add placeholder. 32e8a5c1d Detect and report duplicate SystemIdentifier IDs. 1058ef601 Relax test tolerance a bit. Simplify duct specification in some test files. f713badf4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dual_fuel_heat_pump dca285b2f Merge pull request #240 from NREL/setpoint_change 1e132af0a Removes "setpoint change" component from component loads; load attributed to other components. Code cleanup. f1def2871 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into workaround-desuperheater 4e0deae24 two tank approach workaround 6bc189b56 Merge pull request #237 from NREL/prevent_splat 9435df794 Merge pull request #238 from NREL/fwall_ins_r cf7f47afd syntax c93ddfe08 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into workaround-desuperheater 8f64ad6da desuperheater program debug, no preheat tank approach 0dfa770ec Prevent tiny slivers of rigid insulation on foundation walls. f7e2fe617 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into prevent_splat d1311d42c Merge pull request #236 from NREL/hpxml_class 7daa41898 Prevent use of the splat operator when adding new HPXML objects, which could result in incorrect arguments being ignored. 89bd63180 Oops, revert change. 1573c4b66 Bugfixes. 5fdee34af Use new select capability in the measure. 4b5929e96 Updates HPXML class to allow being more selective about what elements are parsed (for performance reasons). e423dee4e Oops, revert. f48aca87e Adds return duct loads into component loads. Improves program wrt partial load hours. 19fe22335 Merge pull request #234 from NREL/validator_bugfix 64a8f9402 EPvalidator.rb bugfix. b2edb35ed Merge pull request #233 from NREL/unit_conversions 3599ae978 Revert change, not needed after all. e35a43f1c Bugfix. 5b49267b5 Clean up and simplify unit_conversions.rb. Should have some small performance gains? 5702a0b5c desuperheater energy EMS program first cut 24637ec21 Merge pull request #232 from NREL/radiant_barriers f6f9372a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into radiant_barriers d5b2cfc5b Allow evap cooler SEER in hpxml.rb. 91864b98a Swap. 572284228 Connect HPXML input for radiant barriers. 343705aaf Hardens HPXML class to ensure appropriate heating/cooling efficiency units based on the system type. aefee7700 Merge pull request #230 from NREL/unconditioned_basement a02d3024b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into evap_cooler f7c7d4c92 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into unconditioned_basement f63768a92 Heating/cooling fan energy disaggregation is now separated into primary vs backup heating as appropriate. Also adds some output variables needed for ERI. And more test files. c62162aed Merge pull request #228 from NREL/dse 7cd4f729e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dual_fuel_heat_pump 3fbde1ae6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dse 64ef420e8 Merge commit '984ad856546bfcce1af5ef56f88d21ebc77f2ef8' into evap_cooler 1619846b5 Merge pull request #144 from NREL/evap-cooler c2d31d7be Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 01523b73a Remove FIXMEs. [ci skip] 9f1bf2304 Prevent using BackupHeatingSwitchoverTemperature with a GSHP. [ci skip] af42c8d7c Update comment. [ci skip] f25378b26 Revert files to Denver so that tests stop complaining >:( b06de3234 Makes order of objects related to component load outputs deterministic, so that we don't get IDF diffs. 325f94d3c Taking the opportunity to add more flexibility for duct inputs by allowing certain duct inputs not to be provided. Added a few more tests files and minor code cleanup. a22664f45 Merge pull request #231 from NREL/component_loads_bugfix 00a7f8a56 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 2ddf17575 Bugfix for possibility of grabbing the wrong actuator. ca44e2e99 Bugfixes. 9864dd724 Revert change. e1cbd8749 Update hpxml.rb to allow thermal boundary to be specified for an unconditioned basement. Not used for simulation, but can be used in upstream rulesets. 40012c998 Merge pull request #229 from NREL/component_loads2 cff5cbff1 Bugfix. 0dfd544b6 Cleaner EMS program. 9e898336f Simplify EMS program. 0a700a9ab A little code cleanup. eb7c9f412 Adds radiation heat transfer terms for surface and equipment objects. e232e8536 Allow fixed-size airflow rate for AC/furnace in DSE tests. 3b0ed7d7d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into dse 02a81cbc2 Initial implementation of DSE test criteria using E+ seasonal temperatures and ASHRAE 152 calculations. 11d6d192e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler fe276ce40 remove two unused functions? a18603176 Merge pull request #226 from NREL/component_loads 3e362aa74 Merge pull request #227 from NREL/sort_view_factors 9a12cfe9e Sorts view factors to eliminate IDF diffs from one run to the next. de585b4e5 Merge commit 'f4586ce1b67ed62b8998ee4cf9f233545ade8ad3' into component_loads f71204abf More robust test. 233a952cb Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into component_loads 5462c7543 Merge commit 'fa6abc81ac17ad3518a53f274e9af9afda13cbb3' into component_loads 21747a82b A little cleanup. 6f5ce2010 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into component_loads b1ae12dfd And now revert CI test. 66a780699 Another CI test. 4c3e1fbfa Adding ability to model ICS collectors (currently only runs with a dev version of OS) 833545a4c Merge commit '7bcb4419355095b47525d3d2544b0bbef19fec4f' into component_loads 7b29ef458 Disaggregate natural ventilation as well. c18ddc995 Merge commit '7a34e8fc9edc86d3ef532f6ae2175f2ca255cbd1' into update_combi_system_approach 54cd46ce3 Merge pull request #225 from NREL/improve_combi_system_approach 84e760d6f removed tank source side temperature constant 68084460f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into improve_combi_system_approach eec650667 Added combi-tankless multiple test files. Added comments. Relaxed a bit for multiple wh check. b69b0a4a9 Merge commit '29f848257ef8674c34aa13a471a57d4cecfd7206' into component_loads 51f371f7c Use AdditionalProperties to more easily disaggregate components based on the HPXML element. Now disaggregating rim joists from walls and ceilings from roofs, as well as incorporating inferred conditioned floors/ceilings in the internal mass component. 7e556297b Merge commit '4dd2e369f004412d4b249b8a9185016197a1e9ea' into component_loads 92e1675b6 Enable assert. 6c522491b Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into evap_cooler f1c284a26 Merge commit '67a583832cdd9a3cbdc4e91b21f9a905dd33d9f0' into evap_cooler 32993110f remove redundant mechvent controller setting, relax evap cooler limitation to keep consistent with fan operation. d9c397cd1 Merge commit '0e08f21f4ccfa392c588eb7989cb9ecadf4b23a1' into component_loads 1dbceaf3b Oops, forgot to commit these. c4082cd1a Fix failing test due to HVAC sizing bug. Added oil/propane backup test files. 79bdd6952 Merge commit '620e839d4182f61df4502e7ddf992c9596966b23' into component_loads b19a0e85e Setback change needs to occur both during setback (setup) and recovery. c6f03f181 Merge commit '824c5af5e7d11d7d21489755f03a1fef54dfcb29' into component_loads 873fa6102 Add a component load associated with a heating setback (or cooling setup) recovery. Added a couple more test files. Some code cleanup. 845e8df87 Merge commit '86a046333775b545e20fa71497923d7eff70ee5b' into evap_cooler ae73da4a4 Remove GSHP dual fuel tests. 4749ba7c2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into evap_cooler e16010869 Bugfix for MSHP dual fuel. And ensure for dual fuel heat pumps that the supplemental coil does not turn on at temps greater than the switchover temp. 583dbc3d0 fixing XMLHelper.has_element 8ba404318 Bugfix. b2799bdf4 Progress. aaa54260c remove code for dummy unitary system 091c82043 changed fan and air terminal types for evap cooler system, connected new approach with duct program, raked evap cooler sample files 7cc9477ab Merge commit '2701d1fededb689a736f4a7ae09164c603a0ea6f' into component_loads f15c51054 Reduce surfaces. cb771c588 Moves solar radiation to windows category from other categories. dd0272b0f Model dual fuel heat pumps for ASHPs and MSHPs. 01b5ad24f Bugfix. 41d1cf0f5 Progress. fdf1c194f Merge commit 'cd2533c1e4a7e7f07f69e0b473e1826f5f69be52' into component_loads ed01c2bd8 Write component loads to a results CSV file. 897a26c8d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 7cc85923c Rubocop. [ci skip] 94649c225 Progress on water heater internal gains and ducts. [ci skip] 6802dfd6c Added combi system energy balance check 23f866b17 EMS bugfix f775a7986 Changes units for peak load from W to kBtu. 2a27a835f Merge commit '99079336e6ab9259a46e94875a5d7d920d24b0da' into component_loads 7f9576e52 First cut at disaggregating component loads. 59a0ad181 simplify water use equipment EMS program 597c0fa10 Merge pull request #224 from NREL/oil_propane 6c9c85863 Bug fix 00f622478 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into improve_combi_system_approach fd52702c4 First implementation of variable MFR combi-systems. 1742893ce Merge commit 'c64991fccd470da0f776b7d3d435fc63ba44a965' into oil_propane 50de3430b Disaggregates other fuels into oil and propane. 662b214b3 Merge pull request #223 from NREL/rename_output_var 794a7feaf Merge commit 'b82e89c008e8b11b394ff548eecb5ec527fc8999' into rename_output_var 2bf8b4959 Renames an output variable to prevent a SketchUp import error. aee659aa8 Fixed once and for all. Right? dd408671e Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_distribution 8eb668daf Merge commit 'f6fdfd139c6d1cc36d5f642c9f6b37f911d4a63e' into latest-os-hpxml c136aae91 Fix duct insulation R-value; wasn't correctly handling DuctInsulationMaterial. 31a74dbce Fix EC_adj query. 8268e3009 Updated EPvalidator.rb and HPXML.rb. Added test files. 7f74c1059 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw 3a1f79496 Fix EC_adj test by increasing precision of output. Some misc cleanup. 66af424f2 Merge pull request #220 from NREL/ceiling_fans_operation 12ebec31b Merge commit 'a350c15e53f13e31ced90bf755f0f2e7718e4d54' into ceiling_fans_operation d3fc6db58 Need to adjust annual kWh too. 02fa5a492 Bugfix. d38a8281c Fix for ceiling fans running year-round instead of only during certain months. 0c42a3ebf Merge pull request #219 from NREL/setpoints 1e1d9454b Merge commit 'af4d67b7fbc633b61ed638132ac4cf375c591ace' into setpoints d614323f6 HPXML elements are integer, not float. d2cd6a3af Merge commit '8b107b62ec30b6de5cae154e72d9e62825ab1e3e' into setpoints d05cf0f0f Expose additional thermostat setpoint inputs for setback/setup, ceiling fan offset. f6e79ddf7 Merge pull request #218 from NREL/cfis_24hrs_bugfix d8df8eb56 Merge commit '115476c54877984c4dfaa14f03b54f0023377271' into cfis_24hrs_bugfix ab9245055 Fix zero mechanical ventilation energy use for CFIS systems set to run 24 hrs/day. Added test. 86e869b34 Units bugfix. 26f9671d0 Merge commit '7f1a38bd756c77cf77280376b401d2930c2b0017' into cell_params a9dc76a5c Merge pull request #217 from NREL/cell_params a56e5772d Test cell params. 1c4385ca7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into hvac_distribution 156aadf6d Merge pull request #214 from NREL/hpxmlv3 6bf75edf7 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into hpxmlv3 46297367d Merge pull request #308 from NREL/change_combi_system_stp aa44e05a1 Merge commit '196c746d61fc9328e16526477dcee1add03ece24' into hpxmlv3b 89baaf9fb Merge commit 'b80c95b273e9446ff3b76d95fae07730eb80e105' into hpxmlv3 1fa84623b Updated schema. d3dcfb279 Merge commit '8c33512bcd29fb2ca6a82b4983cc134d4c8896da' into hpxmlv3 f1529894d Merge commit '760a4982d409ff0d16a39407833f905507cc3f7f' into hpxmlv3 a7ba17ed5 Update skylight exterior shading. [ci skip] 2215ac701 Merge commit '824dd23b79945a847758ff4b119f02a569d714a7' into hpxmlv3 6a93cbaa2 Update exterior shading too. e7548b301 Merge commit '4bd2b5104e0d8551b62808a1c68beb96041891a3' into hpxmlv3 56cceca8b Merge commit '592738a82478d1756591e691c120ac710176bb9b' into hpxmlv3 11371916a Final HPXML v3? 3de6cd511 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpxmlv3 2a65ecafc Merge commit 'c347f7570e273787642aee361a3de7438aeb1f0c' into change_combi_system_stp a3bbbfb3e Merge pull request #187 from NREL/change_combi_system_stp 6d4106eda Merge commit '0341f97a4e06a1768975cf13b2caf2db55d3e820' into hpwh_performance abdbdf773 Merge pull request #215 from NREL/hpwh_nodes 362b3b9c2 Merge pull request #216 from NREL/fix_negative_net_area_error 7eff4fc29 Merge commit '6081246c715034d2560bed8adf6252b30702b11b' into fix_negative_net_area_error 4fa447c1a Simplify code. 2bde3ef16 Merge commit '7dd408e5b4bf76b34e017be9b1f30365eb93fce3' into fix_negative_net_area_error e4f0a900b Update test error message. bf8c679f3 Remove flag, always 6 nodes bd917b3f6 Merge commit 'ae6817f67326900b35c2dd2d82336647c7c7b102' into fix_negative_net_area_error 4190a205f Fix for possible error "Calculated a negative net surface area". Updated test file. a37b5f159 Reducing HPWH number of nodes from 12 to 6 (on a flag) c97fdc79a Adds volume of hot water delivered to test outputs. bc1372980 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into change_combi_system_stp 33ed740c8 Merge pull request #212 from NREL/collapse_like_surfaces bf1175e7e First pass. 008fc865f Merge commit '2b1e1ef083e9a19babe6b71ffc6f85eaa0f57c02' into collapse_like_surfaces 96ea501d2 Fix ruby syntax. 1a65c6af3 Merge commit '260657857f58b2281f5e6dd64f9f3a10a2ec9a75' into collapse_like_surfaces 74e1958f4 Bugfix and minor code cleanup. a528ed4f9 Merge commit 'dec811e6d240483a5a6d8132a6de985d8288d7b4' into collapse_like_surfaces d5247283e Bugfix for net wall/roof area by azimuth. 7a7b6704d Merge commit '63e202bde0297a1a0c682aa42676b0cecd9dde75' into collapse_like_surfaces fab8c1b48 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into collapse_like_surfaces 126b2df12 Merge commit '084af9c25ea8c6f5786ef42c28466b1e5ee2acb1' into collapse_like_surfaces 4926303d6 Add test file. dd1c4efe6 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into collapse_like_surfaces 209d76f95 Fixes infiltration credit erroneously being applied to SFA/MF mechanical ventilation rates. 5c1782e68 Minor cleanup. 8772d59ad Fixed a bug of forgetting to set fan efficiency to 0.75 35a014996 space error 539e04b1c Same change for unvented crawl rim joist. 2bf5009ca fix one bug of merging, add leakage units information to HEScoreRuleset bc66b3307 Update adiabatic wall R-value. 0d6d0f406 Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into evap_cooler b7c4ff98d Merge commit '6e2e57d194d448d6895feefdd6ab033d26f322b4' into evap_cooler 05e840e9f rake ductleakage unit fixed f8fdd45db Update test. 2a91275ab No need for error checking here. dffb161d7 Bugfix. 2ced8b9ee Adjust area in test file. 01e5a0e69 Add caching to view factor code to improve performance. Reduce size of subsurface parent surfaces' net area, so they are excluded from view factors. Re-try skipping tiny view factors. 8d6d0128f FIx one more. ca29a339d Re-enable all tests. fbe7a7555 Revert lots of code changes. 00831a7d2 Merge commit 'a16ec4b28e50306622746e999f0768d80efa210b' into evap_cooler 6b498aaed Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 9e46be3d9 Merge commit '9b20a2d13b36e0d729f5f2711fd6e6d893f4530a' into evap_cooler f4c7afe2c Merge branch 'master' of https://github.com/NREL/OpenStudio-HEScore into evap_cooler c6c3013d8 Cleanup for hvac_sizing, evap cooler minor changes ea5fb5b55 Further collapse subsurfaces. Updated test file. 61dad98f4 Remove foundation-specific collapsing code. Update tests. 1e348b195 First pass at collapsing like surfaces in order to improve performance, particularly when there are many individual surfaces. 04b6fed53 Merge commit 'e8a404d0c56a0d01a872472d6be369765f6fbb03' into evap_cooler 246e778d5 Merge pull request #211 from NREL/percent_duct_leakage 689ad7818 Use water consumption for fan energy disaggregation 532780443 Merge commit '5a3bec671630afd9b89c63aa80f9c529c466cfed' into hvac_distribution 701fcebc7 Allow duct leakage to be entered as percent of airflow. 61869023a Merge branch 'wh_tank_ua_check' of https://github.com/NREL/OpenStudio-HEScore into latest-os-hpxml 2bde3747a Merge commit '5542ed67a03b9bd0efa350f76379d472bf462d75' into latest-os-hpxml ca6bf4ba1 Remove old files. c00daa5ac Merge commit '8392d0df9a63d8c93cc171e3936a6e3968362e84' into latest-os-hpxml 8f5e2bcdd Merge pull request #210 from NREL/cfis_dse_bugfix b31e6f4f0 Latest HPXML v3 schema. 6802a8e99 fix a bug in fan power assumption; Corrected ducted system sizing (include duct loads) 1df1a1850 Update test file. 41516d171 Remove exception for DSE when determining 1) if heating/cooling systems should be on the same airloop, and 2) whether too many heating/cooling systems are attached to the same distribution system. This allows CFIS to work with DSE. Will have to update the ERIReferenceHome configuration to avoid errors now. 0f36d09e6 Merge pull request #186 from NREL/zero_view_factor 7e457546b Fixing some merge related issues 96eb712fe Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw 77cad4475 Adding in xml files a few different types of solar water heaters to test e2fd287d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw dfa2959a1 Improved parent surface/ sub surface view factor calculation ee61cd837 Merge branch 'zero_view_factor' of https://github.com/NREL/OpenStudio-HPXML into zero_view_factor 66460eac3 remove view factors for tiny parent from_surfaces to reduce size 635b59d46 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into zero_view_factor 542fe857f Merge pull request #207 from NREL/split_azimuth 3dd1abd9e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split_azimuth 27bb510c8 Merge pull request #209 from NREL/zero_hvac_capacity d179df12b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into zero_hvac_capacity 9cf9e9dc1 Fix test. 4208443a3 Round some values and fix units in results.csv. 9ac017fc1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split_azimuth 014b63196 Fix tests. dc4c5bdb3 Merge pull request #206 from NREL/ducts_locations 3869e3017 Allow HVAC HeatingCapacity/CoolingCapacity to be zero. Updated tests. Also removed uses of OpenStudio::OptionalDouble.new, which are no longer needed in the latest OS SDK. 88d066c44 fix a33f9fbae Added EPvalidator check for return duct and leakage inputs. And added invalid checks. f69d14d37 Merge branch 'evap-cooler' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 5f4d211de No need to split up flat roof surfaces. ca3c44092 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split_azimuth 1aa32cf78 Cosmetic changes. Skip really tiny view factors. 0ff58d07f reconfigure ducted evap cooler, add invalid test files 19d5ad98f Setting use side design flow rate (to prevent autosizing issues where autosize flow rate > tank volume), fixing an IAM coefficient that's filled in with a default by OS 368786882 Revert schema changes. 19bcd6791 Bugfix. b543f8d1a Relax tolerance. 77b46ac27 Fix test. 96e7a0437 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into zero_view_factor 2a947703c Remove obsolete function. e75786eda Simplify application of exterior emissivity and solar absorptance. f304c884f Only create one construction for set of split surfaces. 69db25ff3 Don't split interzonal surfaces by azimuth. 6d63967a5 Merge pull request #184 from NREL/solar_absorptance 7972fb03b Remove FIXME. [ci skip] 2cf6f395b Cosmetic changes. Doesn't affect results. f0d839442 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance a4177b70c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split_azimuth 5b2163634 Merge pull request #208 from NREL/from-eri 366d8542c More FoundationWall test updates. 3dfeae285 Update new HPXML files. a16095d41 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into hourly_output d488ec8e2 Update tests for FoundationWall area. 417d023b9 Merge commit 'd62df26d31710949f0e102cbe1adc39d822b78d3' into latest-os-hpxml c72cc6a4a Don't split FoundationWalls; Kiva doesn't care about azimuth and more foundation surfaces results in increased runtime. ba94999ed Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into split_azimuth 982d3e241 ducted evap cooler with 0 area and leakage (dummy) return duct f8a29471c Merge branch 'evap-cooler' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 810b391d3 Merge pull request #205 from NREL/low_r_constructions d84f7febc Update code to handle zero duct surface area. 2e4394cab Merge branch 'ducts_locations' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler f12928d58 configure return duct for evap-cooler test file 58fc483a3 Merge branch 'ducts_locations' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 8865f58f6 Bugfix for locations that don't have both supply & return ducts. Added test file. b9109e9c4 Improvements for modeling constructions w/ low R-values. Various minor bugfixes. 4cfcb9ddb Merge branch 'evap-cooler' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler a819c9233 Latest HPXML v3 files for real now. 01bdcc64c Merge pull request #204 from NREL/additional_test_files ab240a352 Merge branch 'evap-cooler' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler cc363549d change evap cooler ducted system configuration de837ee93 Latest HPXML v3, which allows zero DuctSurfaceArea. Regenerated HPXML files. f39a9dacb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler b2cd01bb1 Add test files that vary # bedrooms and location. 3aca7153c Merge pull request #203 from NREL/redundant_weather_processing 87538d3d1 Removes redundant weather processing. Some performance gains. bc0bc5e8c Merge commit '1333444d77741f5031db240a4d170d51baab815b' into framefloor_other_housing_unit 4f5afca93 Merge pull request #202 from NREL/framefloor_other_housing_unit 982f1437c skip multiple and partial result checks for evap cooler 0259a5314 revert test a24d46a31 allow evap cooler to be ducted. Return ducts not removed. 945c9e158 Changes FrameFloor/ExteriorAdjacentTo to allow "other housing unit above" or "other housing unit below" instead of "other housing unit". Allows us to know if an adiabatic FrameFloor is a ceiling or a floor. cb90dabd0 Merge commit '016d786e25dafd498b2210cf4797d35a7545d59c' into ac_hp_add_inputs a98ebe2fa Minor cleanup to EPvalidator.rb. 85175eefe Merge commit 'd4ef467d7e2e510a7ae8ee96c625a23584c66f72' into ac_hp_add_inputs a050ddc95 output variable, skip hvac_multiple & hvac_partial test for evap cooler - no proper energy output variable to check 9896c6717 remove evap cooler autosize sample file 2990c97e3 Merge pull request #141 from NREL/ac_hp_add_inputs c5bf0d3aa Remove some old comments. d2f6f3454 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ac_hp_add_inputs 9f106e343 Merge commit '7a81c16fc9773333ff7dba01c4e557d1eae7a930' into latest-os-hpxml e8277c16b Merge commit '8e3bd93bf3eaaabd475c7aa037efe7459a25fdf0' into evap_cooler ddc8f01b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler afbfa44ed evap cooler sizing based on manual S, evap cooler conflicts solved, simplified its workflow 9ba446de2 Merge pull request #199 from NREL/allow_tankless_for_more_bedrooms 6d5c4c662 Merge pull request #201 from NREL/cond_duct_with_lto 544c75b03 Merge pull request #200 from NREL/orphaned_ducts 859af8815 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 072c1514a Zero out duct leakage in a couple more files. f3af17e33 Bugfix. 05361cb78 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into change_combi_system_stp a24268df5 0 bedroom edge case f1a1c39fa When there is leakage to the outside but all ducts are in conditioned space, model the leakage as actually going outside. This can happen, e.g., for ducts in floor cavities which have leaky rims. 454966809 Give error message if a HVACDistribution exists but is not referenced. b8e6a4516 fix runtime fraction error when tankless system serves more than 5 bedrooms dfe1e447f Changed mind, requiring HeatingCapacity again. Simplifying test files. d3308d581 split single layered construction into two layers to eliminate exterior solar impact 684ecba12 Add invalid files (i.e., mix of fixed and autosize values) and test error messages. c3886ae8f Bugfix. 4b11218a3 Updates sample files to reduce differences relative to master. Allows HeatingCapacity to be optional (defaults to same as CoolingCapacity). 581c7332e Small bugfixes. 173919bb9 Merge pull request #198 from NREL/wh_tank_ua_check d96be9b32 Removed references to Constants.SizingAutoMaxLoad, no longer exists. e4c5d1107 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ac_hp_add_inputs 065db1282 Initial commit to model walls/roofs/etc. facing 4 directions if no azimuth is provided. 598dbc059 Merge pull request #139 from NREL/wood 536dc4de9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into change_combi_system_stp 047b18ce5 changed recovery time 58415d39b Merge commit 'dca5e4323e6a13710338264f30c5cd4bf7220287' into wh_tank_ua_check f6b0a8ba0 Add error-check for negative water heater standby loss coefficient (UA). 9f5551538 Merge pull request #197 from NREL/fix_test 5a2db6a72 Merge branch 'master' into fix_test 961ded5c1 Fix for wall tests not being run. 7f09be6b5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wood 9e0183dd1 Fix test. 9c86a5741 Some fixes, cleanup, and more tests. 8e8ba8b48 Merge pull request #196 from NREL/from_hescore 84742d6d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into wood 042c1c7e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into from_hescore e96cc490e Merge commit '05be6be92cc00c482d09c6871cf932b58d0b4919' into os290final d79d906d6 Merge pull request #177 from NREL/surfaces_check 385d8eca1 weird syntax :( 8c7e6b3c3 Oops, revert to test all 30b8e4715 outermost layer to innermost layer, improved mat_share approach 86c76c285 Merge branch 'master' into surfaces_check eda46fe8c Merge branch 'master' into surfaces_check 6c4d93174 Merge pull request #194 from NREL/elec_parasitics f19b34f44 Merge pull request #193 from NREL/os290final ed39d1b7c Remove electric parasitics from furnaces/boilers; they are already captured in EAE. cafe86dcf Merge branch 'solar_absorptance' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance 5cd4222e2 Simplify mat approach with OS SDK directUseCount function and some further cleanups 2f076a2e3 Merge commit '3595935339bb226bda0f2b5f77126dd460304d60' into os290final 79098ba43 Merge commit '629fe123a4a4cb0d964c7d2bd3b1f374a066e444' into os290final 2805198c1 Final. d3328488e Merge pull request #192 from NREL/bg_foundation_wall_bugfix 038615665 Merge commit '9722fedb63732320914351ec4d43a201aff39f96' into surfaces_check 200e768eb Bugfix. baaa741b1 Merge commit '43743b8b737af6dc1fc2c1ab66148ea0d8f67fa6' into surfaces_check 585ad1397 Clean up ceiling vs. floor code. 5dbf1036d Merge commit 'eddcd3cbc873276eeb8e4ad00424aa0d3eb2409c' into bg_foundation_wall_bugfix 8aa74b987 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bg_foundation_wall_bugfix b5e90f607 Merge commit '2037caa21d0a0313c04cc0f8c47749b116d59215' into bg_foundation_wall_bugfix a9cafd6f2 Merge commit '0480b7443d44bd56a3f7b7daa3b802985d017334' into surfaces_check 068212d43 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance 7cf2a649b Fix for error if FoundationWall is completely below grade. 84e7bf865 reverting attempt at shading factors for skylights 76c722632 Update. 59db6c817 Update logic. a2005976a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into surfaces_check 277a7ebed Merge pull request #190 from NREL/dhw_capacity cb1543fb2 Merge commit '09e75132ce6fc6575580d38c58b73588ea00a737' into dhw_tests b494258b8 Update EPvalidator.rb. 8cc8c7338 Fix merge. 74b9863c5 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into dhw_tests 445c8615e Merge pull request #189 from NREL/desuperheater_output 4b9866d69 Merge commit '09f419279c1d9601095ccd1816579ceaf6114982' into dhw_tests a4de99a7b Update water heater capacity autosizing logic to pass HERS tests. b94df21d7 Merge commit '9b52c0efd7fccb72947d32a0c8d2016cabd079b2' into desuperheater b27aa732c Add output variable for desuperheater energy transferred. 4b615b29e Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into hourly_output 2aeb4c475 Update docs. Clean up validators. 60cfaad61 Merge commit '27d608408f12ba02702f33c1b7784d20a11d10b2' into desuperheater 1c0c6a444 Revert to all tests. 9c0111c17 Remove old files. ea9469395 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into desuperheater 870ec3984 Merge commit '0b74e935e19701412dfc9e5d63ead0c25449487a' into desuperheater aa675ca0a Merge pull request #112 from NREL/desuperheater aff58f275 Minor cosmetic changes. 4b7a7351f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into desuperheater 99ffdb914 Merge pull request #188 from NREL/fan_pump_disagg_bugfix e1b9abbeb Merge commit '9be1d845d3e0ab9b304850bd9e5b5600649e2627' into fan_pump_disagg_bugfix 7f3ab5c7b Bugfix for disaggregation of fan/pump energy into heating and cooling for heat pumps. 1d6666bdc change of effectiveness e2c9c6501 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into os290 85d3586a1 Merge commit '4ea59ba5d00e26b805cabf893be2f3032d549187' into os290 42052225b Merge pull request #183 from NREL/os290 8c1e281d3 Merge pull request #175 from NREL/more_outputs 225f61f52 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into more_outputs 635e2f283 Merge commit '095c53b7d6d784fb1f7ef3fb529ad8050960491e' into more_outputs 8bcbd831d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more_outputs 90d555fe3 progress for better control, bug-fix 8e91cdd3b Merge remote-tracking branch 'origin/master' into os290 8be1a3fdd dummy cooling coil capacity added, some comments 646d281da Merge commit 'fed66c15a5df92781f392c927ed915cad6d2fb6c' into erv 0445161d0 Merge pull request #179 from NREL/erv-ems-approach 63807512c Merge commit 'e91e6c70962bc0e1d0d416e071ba90d86a59b08a' into os290 1c736dcd8 Merge commit '679f46f6de0b826fbb1f941c4436b3bd14229fb1' into os290 b41ce3529 Bump to rc3. c5afeafa1 lower a little bit combi system setpoint for consistency with other systems b24bacab2 minor changes, remove zero view factor assignment to speed up 30a54d651 Merge branch 'solar_absorptance' of https://github.com/NREL/OpenStudio-HPXML into zero_view_factor 294db6174 removed one function of searching conditioned spaces a5e471ba5 bug-fixed, progress in sizing 0896faf7e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler ed131ac7b Successful run, not sized yet. Not finished. c8f08d8e3 Support for heating capacity at 17F input for ASHPs. Last remaining step is clean up the tests. 7bcb78e24 Merge branch 'master' into bldg_config_townhouse 6c6159928 handling nil interior_shading_factors on skylights 6ee43c931 using interior shading fractions and schedules on windows and skylights f6f98c216 Merge branch 'solar_absorptance' of https://github.com/NREL/OpenStudio-HPXML into zero_view_factor d4f642ed9 simplified mat_share method 126d63e1d view factor implementation faf58b9f8 approximate view factor algorithm interpreted c151d5453 remove one method of previous approach 737233d21 simplified approach 556d05f94 Bug-fixed for furniture mass object creation 3bfb57f74 Wrong argument removed 5af6ff19f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance 7e24bc2f2 Merge branch 'os290' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance 734306dc1 remaining conflict fixed 6c76a1bf7 test changed by mistake b20b58918 revert test 6fcfae483 add multispeed and gshp desuperheater capabilities 012fb56f1 remove diagnostic "puts" 14beb7da7 conflicts 3b1654f2a Merge branch 'os290' of https://github.com/NREL/OpenStudio-HPXML into desuperheater 5619de8e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into desuperheater a209d2a3e Merge commit '98ba20f1cd0b5728fff0e03d5eea016d94981a37' into os290 7587baf4b Bump to OS 2.9.0-rc2. 87863a0d9 Merge branch 'master' into bldg_config_townhouse d47ce825d Merge pull request #185 from NREL/zone_ratio 4ac5e66f5 Adds --hourly-output argument to produce a CSV with space temperatures and energy use by fuel type for each of the designs. e41933c6f Remove references to zone_ratio, no longer needed. 40431bf40 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_absorptance 3217917ff bugfix d00d09e49 Try Noel's docker image. ac6f1e4b8 first attempt c88a22115 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into more_outputs 6c8c875dd Merge commit 'c8586ae3412dbec9127f148a79a032c6e01736c1' into os290 473663028 Merge commit '950cf0f0c97540ec2310186fc344bd98e9804418' into os290 cbaf1ef94 Update to OS-2.9.0-rc1. 45ba00e51 Merge pull request #182 from NREL/wap_bugfixes 198b00961 Misc, minor bugfixes for WAP files. 433512fa2 Merge pull request #181 from NREL/load_fractions cc7c21808 tab to space 58c8e6aff Allow heating/cooling load fractions to sum to slightly more than 1 due to rounding. 70f9a08ec minor changes 554706a81 Merge pull request #180 from NREL/portable_heater 07430a72f Allow PortableHeater as a heating type. 5bdd34836 First successful run of ERV implementation 9a9365880 Merge pull request #178 from NREL/epvalidator_depth_below_grade ed750472f Fix DepthBelowGrade requirement for garages. e05acd8f5 Update check for thermal zone surfaces. c2d22d32f Merge pull request #176 from NREL/epvalidator_foundationwall ecf0757bc Merge commit '47144b818277d2eca30fd96f803ccd23949ed4cc' into epvalidator_foundationwall 742311901 Add tolerance to check. 8f73c520f Fix FoundationWall reference in EPvalidator.rb. 5fe906274 Merge branch 'master' into energystar_upgrades 178cb6e7a Merge pull request #174 from NREL/hvac_sizing_bugfix e866e8ed4 Merge commit 'ccdb98274e3f552b91cf3dcd9eb008df5c63e051' into more_outputs 04170deab Remove deprecated code. 2f245f52b Merge commit '2bcec005b6ecbc1beea2e54e2cbd4f7ac7b375a7' into more_outputs 63d1fd9f4 Add output variables for water heater tank losses. 837136ac1 Merge commit '47615c3e4d39033ce202e0fadae933546cb49087' into more_outputs 8f6288933 Make it easier to distinguish interior lighting from garage lighting. 52d29a72e Merge commit '1d707ac1968d73a85d904a5a008f326ae67332ce' into hvac_sizing_bugfix 437b2eef8 Prevent E+ simulation error due to near zero autosized heating/cooling airflow rate. Can occur for, e.g., weather files of the Virgin Islands where the 99% heating design temperate > 70 F. a35b14213 Some progress c45e74ffc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler f367d9ad1 Merge pull request #173 from NREL/ems_output_variables 0f43ec8b4 Merge pull request #169 from NREL/wap 3e424a501 Merge remote-tracking branch 'origin/master' into energystar_upgrades 09665c803 Fixes likelihood of duplicate EMS output variables. b949aa84b Moves fan/pump energy from the circulation end use into the appropriate heating/cooling end uses in the output JSON file. aaab4e7c1 Merge commit '1a4f82f648677623a603d84abcd3b947e619fa75' into latest-os-hpxml 3d45ad129 Merge pull request #172 from NREL/misc f3414eb75 Merge commit '344e1b47f847efcded3e4a9f9f916397c15f0056' into misc d41af5319 Don't guess heat pump # speeds based on HSPF given the narrow range. f41cf171b Merge pull request #168 from NREL/building_loads dd4f6fdad Merge commit 'ca2b985a756e4ac45f5bdd783fd3d1585a18bb15' into building_loads 746f83e7d Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into building_loads 4beb4e7f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into building_loads 042115349 Merge pull request #171 from NREL/interior_shading f52f5830e Merge commit '0c8416bab2c4b07fc41ec85b6a6ea485e691e185' into building_loads f01c4810e Add heating/cooling load tests for all HVAC systems. 3b67b9aef Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into interior_shading 6dbeaf808 Merge commit 'eb348f93f8f672773de8e24f3739fa0598e1b7f4' into interior_shading b6706dab6 Uses HPXML v3 proposed fields InteriorShadingFractionSummer and InteriorShadingFractionWinter to remove use of extension. a5bdab57b Merge commit 'd6095feebef873c56ded81f7dd09a397c2e65c07' into balanced_mech_vent c8b2f5b34 Merge pull request #170 from NREL/balanced_mech_vent 5f111b747 Bugfix. c51a266be Model balanced mech vent (without energy recovery) without using the ERV object. c6db70fdd Allow refrigerator adjusted consumption. Prevent possible duct errors. 59871d423 adding energy star to water heating lookup 0a94b01ea Merge commit '5b267dd3d1fc38a0c8246a686ffa64e4e702d683' into latest-os-hpxml b338900a7 Merge pull request #167 from NREL/sequential_load_bugfix 765100958 adding energy star to hvac lookup 7168cef6d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into sequential_load_bugfix f9e973055 Merge pull request #156 from NREL/conditioned_basement 4c59c7e14 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into building_loads e6fc1b569 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into building_loads 8c7a61ab4 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into conditioned_basement 88641ecb8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into conditioned_basement cb34c631b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into sequential_load_bugfix 7dfec8c70 Oops, revert. 09ca6ca37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw 300f2a580 Bugfix for sequential load fraction for some HVAC combinations. f3f62f3ec Merge commit 'df28aae03a6e1d164b84e30b2fdc7dffc2e508de' into latest-os-hpxml 1cee43770 Merge pull request #165 from NREL/plugloads 632c9734c Merge commit '3c96e08651682c7ef0804eac7854413f1cd83624' into plugloads faf343824 Add default misc plug loads to all test files. 67a2c1c37 Merge commit '9be268ba59245968b34871de3ffd847c3bee9421' into building_loads 6b316571b Bugfix for ideal air HPXML file. 199d2ab36 Merge commit '62e0ffbd63eddda2feb0283c72b8bcff5641ebcb' into building_loads fcc1bc822 Uses a residual ideal air system w/ Heating:EnergyTransfered and Cooling:EnergyTransfered outputs to calculate heating/cooling loads. Replaces EMS program. e415a4784 Merge pull request #164 from NREL/EC_adj 64538deb5 Merge commit '3d0990ed68faa32646385c035c12cb456e600fcf' into EC_adj 3ac7f4aa9 Fix test for multiple water heaters. f7c497e4d Merge commit '6c48871ff28fe64037a4ca068d2aab477d6b82be' into EC_adj 60ee4fcf2 Update test files to better test EC_adj values that result in negative energy adjustments. 54266636a rake sample files 6d347a77f small conflict 1b42e0d7c Merge commit '92aa21b4547e0da42612f8e8f713cf73eb0a62d8' into EC_adj 66754de67 Add EMS output variable for easier use in ERI calculation. 956db2400 Merge commit 'df1cc792e36ab6c83dfe041b414b953fd2fee888' into EC_adj 332255bac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into EC_adj a2257582b Merge commit '10859a38771da5a51e5bfa931587fe8149c336c8' into EC_adj 20ec1a8dc Accommodate combi boilers in new tests. d0597663c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler 10d1c72a7 Added EC_adj tests for all DHW systems other than combi boilers. 2585f4265 Fuel oil bugfix. 38dc85b0f Bugfixes and improvements. d51586734 Creates HPXMLs via Rakefile. Updates incorrect water heater heating capacity for some files. Applies rubocop. b8dba5866 Adding in EC_adj calculations based on using other equipment objects and EMS 052543e34 Update EMS program for single conditioned zone. 89202b436 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into conditioned_basement 57e2197d1 Merge pull request #149 from NREL/reul 674f67523 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reul 45d0b01b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into conditioned_basement ead796369 Merge pull request #152 from NREL/hvac_sizing a24cf5161 Merge pull request #161 from NREL/dse-combi 3e67ff13c add dse-combi sample file ecbe61a97 Run all tests. 632716c9b Update assumption. 63d321be6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing 1c9316060 Merge branch 'reul' of https://github.com/NREL/OpenStudio-HPXML into reul 2cf091557 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reul 7837a5b09 Merge pull request #160 from NREL/output 4b2f78920 Disaggregates "fuel" in, e.g., ERIRatedHome.csv into "natural gas" and "other fuel" components. Fixes bug related to DSE. Adds checks. b75f42d34 Revert change. 6a3a0e648 Wall bugfix and other misc code cleanup. e0df6a300 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into conditioned_basement 7623cfa5d Fixed heating capacity input for GSHPs. 32ead24e0 Merge pull request #159 from NREL/hvac_error 08bdef491 Exclude DSE distribution type when determining attached furnace/AC systems. c24eac02c Add test file that generates an error. cdb44e96e Simplify code a bit. 71cf7c719 Revert changes. b40a51c4a Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into reul 809fb49df Merge commit '5cb83f3c04e071ef82910c15effb71cc8c4c304d' into reul ff6271c8a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reul b5a73ed8e rake format defbf7e66 Merge commit '6ea940af1ba998a48804e308fba4082a0acad755' into latest-os-hpxml a140b631b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing 97201858c Merge pull request #157 from NREL/complex_foundations 5c1ac520c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into EC_adj 235910bd4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into evap-cooler ed59d21a3 Progress. bd0d53597 Merge commit 'de3f4ae7a5ce97246f897aa2f1280172b7b7721f' into reul 14830bbf6 remove load from hvac map 8934c240c Merge commit '2bf39790238dc70118527856f24cf481e4a11625' into reul c0df0a8f6 cooling and heating load EMS output e34f186b9 Allow fixed heating capacity input for MSHPs. daad22db8 Fixed heating capacity input for 2 stage and var speed ASHPs. And a couple of fixes. ea94952e3 Remove flag. 3a0c8dcbe Update test expected values. c6f3ec691 Revert hvac_base/*.xml files back to having a conditioned basement. 205979018 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into conditioned_basement 63112a465 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into complex_foundations df8d261b2 Prevent error if DepthBelowGrade provided for slab foundation type. c485ac037 Handle situations when windows/doors are attached to foundation walls. 873f81dd1 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into reul 377cc9b2f Merge commit '5701194310b67594efc4c398a5a77ef222bca56c' into reul 10adc6d37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reul fc65ac601 Code cleanup. 7d427d726 Improve use of Kiva to handle more complex foundation configurations. DepthBelowGrade is now only used for slab foundation types. 12c89c907 Support heating capacity input for ASHPs. cd594a5bc Merge pull request #155 from NREL/remove_dse c8915963e Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into reul 607f55d64 Merge commit 'feda5cb9919ead3db98b6d3708ea41d5edf51e59' into reul a215ad455 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reul 2fbdd9ed7 Progress. 87cf57079 Relax tolerance for small numbers here too. 4eaa32440 Merge commit '30612bef37d6cdbd5f6ba8529dafef353e293c64' into remove_dse 5be4c2d97 rake dse sample file 3686b1716 revert DSE sample file configuration. ec8a709fe rotating roof for townhouses 5548e6894 Remove obsolete sizing code. Replaced by apply_hp_sizing_logic approach. 5f9b5e222 Merge commit 'd0d08aaed1db7a3a3d97f2d2a91466665d7e74c6' into remove_dse e6dedfa13 Relax tolerance for small numbers. ddc49a141 Revert EPvalidator.rb change. Added warning. 58fdf4c81 Simplified regain values. a6fc786bb Hook up roof colors for Manual J. Bugfix. 85519563d Merge commit '100ee0998c4fd54264271571c8798e0200bf645b' into remove_dse a92a60ff4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing f255e4df4 Relax tolerance for small numbers. b11886945 Merge pull request #154 from NREL/mixed_water_use 0df445f27 Removes DSE approach and test files. Effect of DSE will need to be post-processed using E+ output. b03429a1a Merge pull request #151 from NREL/duct_loads 1499445ed Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing af5816a16 Merge commit '11ddffd910fe3e5ac0f98faf37817542551dcfeb' into update_oshpxml e07edeeb5 Merge branch 'master' into update_oshpxml 3f149a239 adding comment about height [skip ci] c8f0b60af Simplified approach for modeling mixed water use. 388bb7d4b Merge pull request #153 from NREL/latest_hpxml_v3 5255ce74b Latest HPXML v3 schema. d36c1108f Making changes to how EC_adj is applied. Currently the CW and DW are scaling like I'd expect, but not the SSB. Also need to add in a check for eta_c > 1, but I fixed the base gas tank xml so that this won't happen b6e9d3dd5 R-value bugfix. 72de5ba21 Bugfix for, e.g., AC (cooling) + HP (heating) attached to the same duct system. f601335b6 Bugfixes. d08108ed3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_dhw 060653b91 Add comment. 5f29ed316 Applies ANSI/RESNET/ICC requirements for HVAC sizing. 9863b4ad3 updating hpxml to openstudio rakefile and xml files f9824777b Merge commit '52f870561546e56ff74971d1cb8a9d60837941c9' into update_oshpxml 10d2ad8cf fixing validation df527d385 Fixes latent loads for duct program. fbac46e6f Merge pull request #150 from NREL/autosized_baseboard_bugfix 08d0a37dd Fixes heating capacity/energy for autosized electric baseboard runs. Updated tests to check that autosized hvac systems have E+ capacities > 0. 8e9bab297 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into hers_tests d907f2fd8 Merge commit 'cdbe58fa798ee7544c610f3e68120b0c7aca3975' into reul 56378f941 OutputVars load variables simplified 9e7f83d70 Update for multiple water heaters. 75b31562a Merge pull request #148 from NREL/appliance_defaults ec4cf980f Merge commit '560bdda0cf757dfccac21f513f54a72e13c71cf6' into hers_tests c6113bfcc Updated appliance defaults. 9c110e400 Merge pull request #147 from NREL/wsf 64d7fa746 epvalidator changes 91e95b6cd using unless one liner 04c7f7e99 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into custom_weather 8c11a80f8 adding neighbor height argument to HPXMLtoOpenStudio 5c5c6cbdb Merge commit 'f62a95cf9b66529fd765a57e7d05180d19455e32' into custom_weather 12008745a Apply rubocop. 7fca715c4 Merge commit '9bcebdb0a74ab0b0ef721044a6a824ff91f0ef6e' into custom_weather 86021bbeb Calculate ASHRAE 62.2 WSF values rather than looking them up in a TMY3-based table. Improves WSF values for non-TMY3 files. 1f48139f6 Finalize SHR input for MSHP, GSHP, and Room AC. Cleaned up tests. 935c06c31 Merge pull request #146 from NREL/mech_vent 9fb415fc0 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into mech_vent c47d3050d first attempt to bring standard approach for evap cooler ccf501783 Merge commit 'f79259e069bf47c77b45affaf941cdab5a5652c0' into mech_vent 66a2972ed Allow TestedFlowRate or RatedFlowRate for mechanical ventilation systems. Bugfix for fan power of non-CFIS systems when hours of operation is less than 24. dc4a7ab65 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into tank_jacket dbd89fe3a Merge pull request #135 from NREL/indirect_water_heater 117e16452 Merge commit '6e5a5bd2e1a9f901668ea692ec0af8cce80f011b' into tank_jacket 7e62823ea Merge commit '98d8df9281c99b299bb62227de465e03fcd242e1' into latest-os-hpxml ccc38c9e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater 70b19403b Merge pull request #126 from NREL/tank_jacket_insulation 70c36a005 Merge commit 'c8dc64f5393d61a3f615cd70c4c09b10c359c20e' into latest-os-hpxml 789e16bff OutputVars name changes ca3a39af7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater f7e2e65fe Merge commit 'd3d14cb5c73f503f2d174f98dc7839cc4b6ee92b' into latest-os-hpxml 52f2493f8 OutputVars combi system variable name changes 2e30961a3 assumed fuel type for indirect system bec9e2cd1 minor code changes b83d64c12 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tank_jacket_insulation 706a0dfa3 gas skin assumption adjusted by EF, hpwh skin assumption 2 inch, electric kept as 2 inch b6b56940d Add SHR input to ASHPs. 9524a1236 Add SHR input for central air conditioners. Simple first cut at test files. a7f8d600b Initial implementation to allow wood for heating, water heating, and appliances. 9d4c483b2 Merge pull request #138 from NREL/hvac_autosize_tests ab9abc8df Merge pull request #137 from NREL/cleanup 167e84f00 Add more HVAC autosizing tests. Remove some unused methods. 81a779e54 Revert Rakefile. 8f0b1fc5a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cleanup d55108235 First cut. 01dcbe93c Merge commit 'a8ad99c650b7862c7521975eead4f6e1cb0f2486' into latest-os-hpxml 1fabcc614 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into latest-os-hpxml 588d032b0 Merge commit '8b7d9ce1da00ac397bde647848b6d63dc2cbecd7' into latest-os-hpxml 49a7c4dfe Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater 591490b3a OutputVars added for indirect system ERI calculations Indirect tank source plant loop volume set to 0 to better track energy 88094a621 Update EMS disaggregation program to operate on pumps in addition to fans. 53ca263ea Merge commit '61c8b8579f260eae584710865a4f38e9578ce3e5' into DSE2 05bf8efdc Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into DSE2 86fed18e1 Merge pull request #128 from NREL/DSE2 c26fb7dd4 Use ruby so we get codecov results. 22da37b52 Convert update_measures.rb to a test. 55875bf48 Run full test. fd90c8765 Test. fa4bbed05 Test. 51ff07478 Revert to using ruby on CI for successful code coverage. 9ec5f3f1d Update CI commands. 8181344a8 Require nokogiri specific version. 523ddc181 First try to remove need for rub/rake/bundler and rely on OpenStudio CLI. 2aff675b1 Fix HPWH. 1233cdf11 More. e5639fc2e Remove unused code. 710233fcc Add rakefile to code coverage. 638e27471 Update README.md 3393ac791 Merge commit '542431177ac24dc5498b0fee631d65303b06d1e5' into erv_inputs 3bb0717bc Merge pull request #129 from NREL/erv_inputs 9a7f9dd12 Update 301validator.rb and tests. a82afa361 Merge commit '8fe8314dd0ed4930a15f2223a6ef560f8316e94d' into erv_inputs 5c0d86af3 Simplify test code. 3da6f9fda Bug fix and additional ERV test for ASRE. 5e6c9cc13 Include tests for new HRV and ERV input options. f553a27f7 Merge commit '410171b09b64f006ec28ced0a41cc8515edda07e' into DSE2 400831faa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into DSE2 7f0711182 Merge pull request #134 from NREL/hp_sizing 5c2cb4d79 Bug caused by conflict fixed, format raked 64020912f Merge commit 'be5cd0bcdc26dddb7f7db287ae765c4fab7fdcfc' into hp_sizing 3ac08c310 Bugfix. 63ea04f4b call ef assumption function for indirect water heater, minor change, add calc_tank_ef function for ERI eec calculation 2d26f5d05 REVERT HPXML-OS FOLDER CHANGES 297c46d0d call ef assumption function for indirect water heater, minor change, add calc_tank_ef function for ERI eec calculation 6928ee6bf Merge commit '4a2da5deddff7a4730036d6b2b2a801667a68c23' into hp_sizing d226baa0c Added a couple test files that previously had a problem. Also refactored some of the tests to work with files w/ multiple HVAC systems. 3ddd0ba45 Merge commit 'e49aefe738e407a4c4310f70e08a7cbbc82c2e2a' into hp_sizing 24479737c For heat pump sizing, implements logic for using max(heat, cool) load. Also a bugfix for when FractionHeatLoadServed and FractionCoolLoadServed are different (e.g., ERI Reference Home). 42cdc06f5 Revert HPXMLtoOpenStudio 3c97039a0 tests changed, modified get_dhw_fuels for combi system in energy_rating_index.rb, eec for combi system need to be modified too 59e2b011b Merge commit '4eba04c6fddea23333be5a8a3b9234d44d933d5b' into DSE2 c80cf39fc Bugfix. f5ee715f9 Merge commit '0c1491c81430758b3b0d333e61e2e2b0ac810fa0' into DSE2 fe99d9966 Allow CFIS w/ DSE for, e.g., furnace/AC. b7a9bab7e Forgot to update a method. 995a93f39 Bug fix. ab9678c4a Bug fix. 1dcaf69be Update inputs and calculations to handle SRE/ASRE and TRE/ATRE for HRVs and ERVs. 18aa108d8 Merge commit '86f0078383f7a602eeb995057a580c267fc0c51c' into water_heaters_outside2 497d3a378 Merge pull request #130 from NREL/combi-boiler-outside 68fc10748 Latest HPXML v3 schema. 62295a3a0 Allow combi boilers to be outside. Some code simplification. 1b2e351fa Merge pull request #122 from NREL/water_heaters_outside 05659eab0 Starting to add adjusted SRE. ae79633fb Merge commit 'f2d91b8534164b48391c06b8fa9e46ee97d3f024' into latest-os-hpxml 8b4d622d1 One more change -- code should apply to both situations now. 4d24e8709 Bugfix. 004b16143 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into water_heaters_outside df7b5235b Set values in consistent location to other code. f50c8d5b5 Remove old comment. d01e3307d Fixing HPWHs outside. Now correctly sets T&RH to outside conditions 79cbcb783 Allows different heating and cooling DSE values. 65bfa270c Updated DSE test files. 0f8892ea4 Initial implementation of better DSE approach. 067ae49eb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tank_jacket_insulation 10c021a60 Rakefile code simplified dbf61d43e Simplified outdoor tankless and storage tank workflow 06778ad02 indirect option test added; Need to verify result e67e727c4 Revert "First pass at new DSE approach." 5485e8e1f First pass at new DSE approach. 27875ca11 Merge commit 'f315af7c08a87757cbf6ddae74d8392c059ce486' into ducts_outside bf70871f0 Merge pull request #125 from NREL/ducts_outside 4ccfaa022 Remove extraneous lines. 9997e044d Added outside ducts to multiple duct HPXML test. Bugfix. f4258bfbe Added test file. d18339b4a deleted two unnecessary lines 946b5cf81 EPvalidator conflict solving accident, jacket option line moved 5a3dfba39 jacket implemented with JacketRValue (side area only) 0106b7ed7 Revert. b920705e5 Initial implementation of ducts located outside (e.g., open crawl/pier & beam). 61fc4c271 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into tank_jacket_insulation 751140cb8 new test file raked for jacket 88e1deec4 Merge pull request #124 from NREL/central_ac 6e9628261 Update central AC enumeration. 157053a1f Merge pull request #118 from NREL/indirect_water_heater 131e9d64d Merge commit '201281c8ae4e15df4106171a76ef10289df042d9' into indirect_water_heater 8e134d04f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater b008c5b14 Remove some more old/conditional code. a9594274c Merge pull request #123 from NREL/hescore_pv 498e5ea84 Add PV methods. e4ded3da8 Merge pull request #121 from NREL/hp_backup_sizing 751b4f3ed First cut at hooking up inputs to E+ model. ce5a10044 Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HEScore into indirect_water_heater ae4f2f55f Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater 924b8df0c Minor changes 088a2c3e3 Update EPvalidator.rb and add test files. e4adcca79 Relax tolerance. bfe857442 Bugfix for heat pump backup sizing. 2a0577f7a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater 8f0a6f921 Merge branch 'master' into indirect_water_heater 130fa6658 Merge pull request #119 from NREL/dishwasher 5078568bb Merge branch 'indirect_water_heater' of https://github.com/NREL/OpenStudio-HEScore into indirect_water_heater f1d1a9076 Oops. fe853c141 Update all appliances/hot water to be closer to default values. fd094afcf symbol change 669696275 Merge pull request #219 from NREL/os281final f135ab719 Use more realistic dishwasher performance values. 237d62585 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into indirect_water_heater 7012c364e new line reverted 12fb91aa8 combi tankless added relatedheatingsystem changed to relatedhvacsystem for v3 HPXML schema 2230dc1e5 Merge commit 'eb7173815cfd6d5116ee9399bf8a1943a9b89ad0' into ssb f7a0ea84b Merge pull request #114 from NREL/aggregate_ssb b7f32d5b7 Merge pull request #116 from NREL/HPWH_improvements a4972f324 Pushing changes to 2 and 5 br draw profile max flows. This should hopefully fix the remaining differences between SSB and the disaggregated schedules 1f773fff6 Merge commit '14d2924a58f151757e7d06eed8c6441e233fbcfd' into desuperheater 10d650568 Minot changes to comments. a5ac524fe new lines added b7d4f7fe8 Merge commit '853d783402da5d0741295df43bc8c1927c309161' into indirect_water_heater 36e716f02 Merge commit '52e2e4e8bfd38a376740ca4243579bf3cb36dc47' into desuperheater d588a3011 Fixing some of the scaling for combined SSB draw profiles 2d341948f test_invalid file name changed, new desuperheater skip hpxml added(test not run yet), other changes follow comment b4cc201bc Fixing SSB combined draw profile. Results now match within 0.01% 5e4039738 Merge pull request #115 from NREL/os281final 1260d1148 Merge commit 'cb6c3baed755a58823c452fcb79ac1b3b961cbf2' into os281final 1a2898222 Bump to …
shorowit
added a commit
that referenced
this pull request
Feb 3, 2020
Error-check for negative water heater tank UA
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.
Address a few common complaints about the ERI HPXML Use Case for Enclosure elements:
This PR uses proposed changes to the HPMXL schema to increase both flexibility and simplicity for software developers. It flattens the HPXML file structure required for ERI calculations by eliminating the use of Attic/Foundation/Garage elements. Instead, a series of surfaces (Roof, Wall, RimJoist, Floor, FoundationWall, Slab) are provided directly on the Enclosure element with appropriate InteriorAdjacentTo and ExteriorAdjacentTo elements.
The updated ERI HPXML Use Case can be found a: https://github.com/NREL/OpenStudio-ERI/blob/v3_enclosure/measures/301EnergyRatingIndexRuleset/resources/301validator.rb.