Latest OS-HPXML #1158
Merged
Latest OS-HPXML #1158
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
…65bce 4d634565bce Merge pull request #1456 from NREL/whole_sfa_mf_models_unit_multiplier dd97163b14e Latest results. cfcdcd8d386 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 61a41f2c9f7 Remove a few more unnecessary sample files. 6f33b34af4f Latest results. 0cb03bdb56c Fix CI. 11c321e7afe Don't write Building/Site element when not needed. b159db6a6f9 Rename more sample files for clarity. 326d9472756 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 1d6ffc2b227 Add base-multiple-mf-units.xml sample file. Rename base-multiple-buildings.xml to base-multiple-sfd-buildings.xml for clarity. Fix CI tests. 0227ed5e392 Latest results. c646b84651e Address more FIXMEs, remove some more unnecessary sample files, speed up workflow tests (exclude real homes). 2c7185063a6 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 4ed175e57e9 Address some more FIXMEs. d3f54ab5fa0 Remove some unnecessary sample files. 2ec7515e68c Latest results. 44976111ea6 Fix mechvent preheat/precool test. 82faa225b26 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a1395a187f5 Latest results. 9272388f63e Backport bugfix. 8b9a9e28f1b Update expected test results 6471ae75cca A couple bugfixes, lots of cleanup, docs/changelog updates. cc37bc34112 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a689e466178 Merge pull request #1532 from NREL/low_flow_fixtures ca4fa038648 Latest results. 81ed09b8d87 Allow `WaterFixture/FlowRate` as an alternative to `LowFlow`; hot water credit is now calculated based on fraction of low flow fixtures. 8d481de9fcb Latest results. 144ababc124 Bugfix. b0c5c382a92 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 5d25dc9c564 Latest results. eb7ed26425b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 0fe28b00465 Merge pull request #1503 from NREL/whole_bills 6d833e25183 Refactor a few things in bill measure. d4b3f1ea20f Create a has_fuels method at hpxml level. d7a214ed92f Remove random seed arg from tasks. d4fae980c4d Remove local extra_files folder and update measure xml. 6ac48096684 Merge branch 'whole_bills' of github.com:NREL/OpenStudio-HPXML into whole_bills 4c4fbf28fcc Look for bills in special multiple_buildings test. 0a4e92b905b Latest results. 7c8d5b0756e Collect, and move up, pv systems. 3a218edaf21 Update message in translator test file. 73b5a277b0b Add a test for throwing new warning. b8e853a56c4 Initialize has_fuel hash. f4ac28e27da Move has pv up. c9b08a3748e Check for pv across all buildings. 608ad9d1148 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_bills 6fe715389d1 Latest results. 3d9a2b76634 Latest results. 22546bad3ae Merge pull request #1501 from NREL/hvac_sizing_tests a3935eb14fb Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests 648d796e89d Fix multiplying by number of units. 6eb7fc8ddfe Refactor schedule measure to operate on hpxml doc. d35c39f3a4b First cut for support simple bill calcs for whole buildings. 3461e539387 Add multiple buildings sample file with bills. c9b2c376d51 Use hpxml ctor error check on building_id. c2d7cb9ce2d Merge branch 'master' into whole_sfa_mf_models_unit_multiplier b6fd48e5c0e Latest results. dd0aae67bde Merge branch 'hvac_sizing_tests' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests e88db546d54 Update failing CI tests. 96513753bf3 Latest results. 0dc595f1998 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_tests f83826e6808 First pass on replacing HVAC autosize simulations w/ unit tests (for speed reasons). 5c1899ed6d4 Merge branch 'master' into whole_sfa_mf_models_unit_multiplier 49968449954 Update build measure to check more on emissions scenarios. 5c6ea0711af Show bug by assigning emissions fuel units in base-sfd-header.xml. 7b19de7cd68 Need to check number of buildings here too. Pointed out by @joseph-robertson 255fa708b5f Merge pull request #1457 from NREL/build_whole_sfa_mf_models_unit_multiplier 807e7465c70 Few review items. 3a8d55b5547 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 3682e332fe8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier fe46a5e09f8 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 4ee7943a3aa Latest results. b63b0b8e6a6 Latest results. da13ed33f68 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 340080c2be5 Fix CI failure 0c8459b1d53 Bugfix. e8084e0c175 Bugfix. bad31f76df9 Bugfix. 4fc424efb03 Revert. 6ff05d83158 Add error-messages around building features that are not supported. Re-enable more tests. b97017bd50c Change a value for bad emissions scenario file. 72332831c79 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 0c7f5957cf4 Allow emissions same name but different type. 5bd86227061 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 4902b2839b6 Update same emissions scenario name in sample file. 7f6a43b6e9a Update logic for catching header issues. 6bee34ee7c3 Possible merge conflict in tasks.rb. 17ce9978ee6 Refactor error checking on hpxml header inputs. 777c469605b Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier e9f3c2c1f01 Latest results. 5205e1889d9 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier b101c77b6cc Bugfix. 8a185d891a7 Latest results. f1a03366f25 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 88f797203d9 Fix tests. 9b4a761d77f Moves some elements from SoftwareInfo/extension to BuildingDetails/BuildingSummary/extension to allow variation across MF dwelling units. 7e85203caeb Fix CI failure. 1606aa31c86 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 2d79faf67d4 First cut at errors for conflicting header or building inputs. a28777224db Clarify new argument and add more description. 27c8a79b1b1 Clarify test. 4fb3faf3905 Merge branch 'build_whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into build_whole_sfa_mf_models_unit_multiplier e8c49e0f859 Remove need for base-two-buildings files and call BuildResidentialScheduleFile once for each building unit. 0b604eb8f71 Revert comment. [ci skip] c407654cd5e Clean up. ec6519a385c Add comment about deleting extra SchedulesFilePath. [ci skip] 10170eb1cb0 Regenerate both schedule files from new sample file. becc012fcb9 Actually add two buildings sample file with different detailed schedules. 7a95206671c Create a new sample file of two buildings having separate detailed schedules. d9d57f6578c Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 36c3b083765 Merge pull request #1478 from NREL/whole_sfa_mf_models_unit_multiplier_schedules 0504e746628 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier_schedules aaabb6922a9 Remove obsolete code. 00a53dc1f9f Remove battery losses EMS output var and use other equipment object directly. 449e690b705 Latest results. 4b6e05d75d3 Few more updates for the deprecation. 998b658ea19 Deprecate hpxml header location of SchedulesFilePath. 98d91cf8a65 Respond to review comments. 2d3e5b12a6f Update validator and ruby error messages test. 693c7aa5f42 Update docs and epvalidator. 816536fe0da Few fixes in build schedule file tests. 4d28cc0b0cb Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier d1dd11fb313 Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules d8c2883bce7 Does this help? d76e39f3b9b Probably won't help, but no need for these to be global vars d10f149d20c More debugging 46fb2cf20fe Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier d4e9fc6e428 More debugging c54d757fab8 Latest results. c361087badc Revert to OS 3.6.1; trying tests w/o parallelization 601d0c9a220 Update for OS develop a51d78e1598 Resolve merge 0978d7dd4c0 Update for OS develop af8081eda0b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 696eef19e6d Try develop ee18aabdc5f A little more debug 77bdf2d4c9a Debug 565a6f027a2 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f6f2ec45289 Revert to full tests fc8db4b921c Latest results. c8a2b3a09b0 Improve stratified tank UA calc. Some refactoring of schedules to reduce global variables and avoid a ScheduleFiles::set_unit_model method. cfcbf6bcefc Fix CI? d4c2452d572 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 9002ccd9a90 More progress on DHW. Stratified tank (non-HPWH) and solar test files now pass. 5ce28171454 Add error message 5180896badc Update `HPXML::has_fuel` method to work with multiple Buildings 50a2293b6b5 Latest results. 1a21f2e7b97 Some code cleanup/simplification. 32e5d6cb81f Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules f8082a6b20c Append in.schedules.csv int only for 2+ buildings. 33635792394 Add error-checking if unique objects have different values across dwelling units. 7b84afcccad Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules fced7235737 Updates for schedules filepath backward compatibility. 3858f3940c5 Attempt to address meta_measure.rb FIXME 0ff590cc488 Carry building_id to schedule file measure in run_simulation.rb. 6b46d321b83 Updates for bldg header and schedule variation across units. 3612308b82e Merge branch 'whole_sfa_mf_models_unit_multiplier' into whole_sfa_mf_models_unit_multiplier_schedules 966a5a69912 Update schedules and validation test files. 11f5ffa33cd Update expected warning bbc25749e1b This FIXME has been addressed. e9e7595c35f Provide a warning when NumberofUnits is greater than 1 04a9d186eb7 Revert removal of the unit_model workaround. 74ad7beb6e4 Introduce new building_id argument and test it. 0e0978686fb Updates to schedule file measure for multiple buildings. 3608f7ef79b Update build schedule file measure and tests. 039b9acc475 Regenerate all sample files with schedules filepath. 64df290a544 Update build measure to write building level schedules filepath. bb6995a02e7 Create class for schedules filepath at building level. 179eb3a6a77 Latest results. fca555c8368 Exclude file w/ battery. 398a0792270 Add timeseries test asserts for 1x vs 10x results. d395572ae45 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 8e9a50696dd Timeseries airflow outputs now work. dbf8fbe02a7 Latest results. 9daa31e673b Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 8c4a1b03955 Enable more test files. 61f1a57ff47 Latest results. 808381f7661 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier bdbcddd1d6d Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 6f32530cf4a Enable more test files. 379d9e765eb Latest results. f3521172144 Fix CI error; this seems to be a better solution than the previous hack. d64bf86a9a2 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 70029045cf5 Latest results. 81ebbc6f48b Address duct losses. d9fc66acc53 Address GSHPs a97a58c10cf Latest results. 1c2ef6dffff Skip another battery file. 2c4f0ecaba8 Fix CI failure 2109812b489 Update HPXMLs 34249402dab Exclude batteries for now. da32377dcb2 Some code cleanup and minor bugfixes. 6e49026dbb2 Increase unit model shift to reduce possibility of shading 18f32ca6a4a Bugfix. 22ed937b976 Avoid setting unique ids on the first building element. 97b09ec628e Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 686567ad5f5 Backport Joe's bugfix. 1bc97a11391 Fix CI error. 8bb3af6888e Latest results. 21c1d9f3238 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. e7014938c92 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 0bb3503b460 Oops. 25b3d9ee479 Latest results. 581ff502289 Address unit multiplier for batteries. 867d244aebb Fix merge. 6ed0c433084 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 0dd6be8bdae Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier a4072e75629 Add extra build measure tests. ecdfd3bde82 Merge branch 'whole_sfa_mf_models_unit_multiplier' into build_whole_sfa_mf_models_unit_multiplier 7823911ce25 Latest results. af530fec35c Fix unit multiplier tests for PV, generators, and mech vent. 01b292fccbe Latest results. 01b6e96fbdb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f1da02990a8 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. 129f367c92e Need to ignore shading_id attrs. ff3aed82522 Remove debug line. b0430c9f769 Validate files created in build measure tests. 8c95d15f692 Handle all buildings from workflow tests. 8ceda701c43 Set unit_model on schedules_file instance. 692f9aeed65 Avoid hardset of site id and shading ids. 50b4970af38 Remove clothes dryer from first building in sample file. 2590ba7ad7c Try multiple buildings with detailed schedules. 98925580995 Avoid duplicating bill scenarios. d05086b64ad Make SiteID variable to avoid overwriting it. ec313d7fb8d Update sample files. 9cd85ce62e1 Update build measure to add buildings to existing hpxml file. 89732f2cb8a Small bugfix [ci skip] d4af087d88c Update ReportSimulationOutput so that more outputs are for the whole MF building. Still need to fix and double-check some things. 0d61bd1a0a0 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier 77c49d4edd5 Fix CI failure. e347a970d7b Latest results. 93b757ce2eb Update in.xml to reflect the entire HPXML file when using `-b ALL`. Let's see what breaks... d6c8a73ec28 Fix a couple more tests. 88626d65d5f Fix lots of CI tests 3ca3daaf772 Merge branch 'whole_sfa_mf_models_unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier f8616b21b73 First pass on expanding HPXML class to support multiple HPXML Building elements. Not everything works yet, but many things do. 16acfc6cf26 Latest results. ef3e4c470b5 Bugfixes. 9501aef1754 Fix possibility of missing tmains schedule. Fix boiler pump energy. 83da1fc485e Improve water heating and tank losses 712883a3024 Merge bugfixes. 02905d38b8d Address heat pump backup. c731a179cf0 Merge branch 'unit_multiplier' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models_unit_multiplier c5ad64cdea4 Fix CI failures. b99c32cef07 Bugfix. 9b4f957fa96 Fix water heater EC adjustment and boiler pilot light. 4e7d16abec1 Progress on appliances, lighting, water heating, component loads. Fix cooling. 8b64ec6a74a Apply it to all thermal zones (probably doesn't matter for unconditioned zones, but matters for duct zones). efe6d818e25 Step 1: Use E+ zone multiplier. 0534a62ff16 Fix CI error with a different hack. 2fe693ac9ba Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 2c1ffcb1cb5 Fixes CI tests 1d41b521ead Some runtime improvements. f1839d16241 Latest results. b15d861d800 Prevent overeager EMS renaming related to 'foo' and 'foo_1'. feb60267dc4 Fix typo. 7b100bd1f4b Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 07f0ae43ede Avoid using object names to infer the building feature. Other misc cleanup. ce90c7e5222 Latest results. f29e242ab6e Latest results. a024f270c85 Bugfix for no ducts. cf7820ed1b6 Bugfix for loads calculation when there are multiple duct zones. 019df591dbf Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 9ad2cbfa49f Fix unmet hours. 1879b8d2bb5 Latest results. 09abfa44f51 Bugfix. 6399212aa8d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models cbb8ff9be07 Bugfix. e8446249897 Address total loads, component loads, and unmet hours outputs for whole-building models. 42363adc59a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models 22efeb8794b Merge branch 'whole_sfa_mf_models' of https://github.com/NREL/OpenStudio-HPXML into whole_sfa_mf_models feaad3e9d63 Port over unit geometry shifting. 834961bb36c Latest results. fd5ca970ed4 Fix CI tests, maybe. 6e8523fdb4d Bugfix; only process weather once for faster performance. 1cfeb80e2d7 First pass on being able to simulate whole SFA/MF buildings using code prototyped in URBANopt. git-subtree-dir: resources/hpxml-measures git-subtree-split: 4d634565bcec675f3d936df92dccc2d1dcd16b1b
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
Pulls in:
Checked means that something in resstock was changed or updated as a result of pulling in.
Checklist
Not all may apply:
Documentation has been updatedIf related to resstock-estimation, checklist includes data dictionary, source report, options saturation, options_lookup.Changelog has been updatedopenstudio tasks.rb update_measureshas been run