Latest OS-HPXML #1347
Draft
Latest OS-HPXML #1347
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
…06f644e dbb0606f644e Merge pull request #1919 from NREL/hpxml_class_multiple_versions 4959249a7553 Merge pull request #1918 from NREL/output_meters deb66cc881f1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into output_meters 0186fb4caef2 Disallow commas in timeseries output requests, add test. c77a9fd74d61 Bugfix. 96621f26189e Merge pull request #1920 from NREL/zone_design_load_docs 3aab71bdc13b Fixes missing ZoneID references in HVAC Zone Design Loads documentation. [ci skip] 6211ab79119e Allow multiple ERI, etc., program versions in the HPXML class for OS-ERI. 0137c05896aa Typo [ci skip] a68b5ec2f6a9 Allows requesting timeseries EnergyPlus output meters (e.g., `"--hourly MainsWater:Facility"`), similar to requesting EnergyPlus output variables. git-subtree-dir: resources/hpxml-measures git-subtree-split: dbb0606f644e64fc54d8335b9569558f8cb54db1
…c77261e 5673cc77261e Merge pull request #1925 from NREL/neep_ashp_sample_files a234d81cf813 Latest results. 4a1e6ffef691 Update sample files to correspond with current NEEP ccASHP listings. b2a89e881ec4 Merge pull request #1922 from NREL/fix-tcm-str-not-dbl 2b4dce026a8e Merge branch 'master' into fix-tcm-str-not-dbl fe64eb4e6206 Merge pull request #1921 from NREL/fix-2-day-partial-unavailable-period e033ebd84072 Add XeroHome [ci skip] a563110bf672 Change tcm from string to double argument. 68ffb9f7366f Update the changelog. [ci skip] c1b2ca202a27 Refactor method and improve docs. 63afe4d5908d Add unit tests demonstrating fix. 32593b30f003 Support 2 schedule rules for unavailable period less than 24 hours. git-subtree-dir: resources/hpxml-measures git-subtree-split: 5673cc77261ed72c551ee1fbeb9d990692b401f9
8 tasks
…0d819e7 5c1f30d819e7 Merge pull request #1927 from NREL/bugfix_glass_block 1a3d1d9eacd1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bugfix_glass_block 97e8de070c72 Fix possible glass block error. git-subtree-dir: resources/hpxml-measures git-subtree-split: 5c1f30d819e7028b492855e857203e70ea73665f
…9ef9a04 ed9269ef9a04 Merge pull request #1533 from NREL/ev_batteries 3f8d13ec9078 Latest results. e7f9caec1ad5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 04d6d8a64f54 Add default value references, fix table footnotes. [ci skip] a1f48d8b7388 Latest results. 6e2add64c6a0 Update reporting measure 2f6be2f52f21 Documentation updates. Removed some attributes that shouldn't be in the HPXML::Vehicle class. Renamed "Unmet Hours: Driving" to "Unmet Hours: EV Driving". c5733d77b18c Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries bf5776dcf487 Incorporate unavailability periods. 72878f9683ef Latest results. 667630720b94 Allow optional ChargingLevel input for EV chargers. Latest HPXML schema. 84d557cc0028 Latest results. ad001b6ff008 Allow more fuel economy units for EVs. Fix documentation for EV plug load default kWh/year. Remove separate charging/discharging schedules. Some misc cleanup. 70edbf2cdb8c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries e9b3076a8b24 Latest results. 9a3f6350b8af Fix unit test f717b9b4afe6 Remove unused file 2e0e03c3a753 Update default assumptions for detailed EVs and EV plug loads. 60bc114b178f Fix schematron error 18b9afcfc83e Fixes for unit tests 564f1f6a017e Relate the default miles/year and hours/week vehicle inputs. 960bf9287d59 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 82224e3f9214 Update descriptions of EV scheduules in docs f8acc1eef339 Latest results. 50b15b909d11 Update some inline docs and argument descriptions; code cleanup. 6848a8615dc5 Merge pull request #1916 from NREL/ev_batteries_reporting 4864b8b420bc Latest results. 95960afc8a45 Clean up some comments [ci skip] 7e954de619d5 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries_reporting 0147a17fa4df Latest results. 4357d93d9022 Bugfixes. a8983fac5043 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries_reporting 1c0cbcc1a4f8 Cleans up reporting measure code related to EVs. Adds EV energy use to utility bill calculations. d1f2cfd733ae Revert EV schedules attribute can_be_stochastic 685101192a57 Update docs for latest EV schedules approach; fix outdated attribute 495940d59ff5 Revert back to combined EV charging and discharging schedules for 24-hour fractions, optional combined or split for schedule files. b03246453b03 Update documentation related to Vehicles ba4c8db59464 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries f3f25e5174f7 Change EV schedule column names, update a sample file 522c4a0c3b6e Latest results. 3b85a5373046 Custom meter to include EV charging with electricity meter and peak power calculation; more specific handling of storage variables added and removed from electricity fuel output. 04ca92e07e72 Latest results. 7f466bf8bf60 Latest results. e545ef151672 Add the FractionChargedLocation element to the sample files. adfdd1f58f6b Oops, lost this `return` too. And update CI test. cd3833123478 Oops, last the `return`. c1721d09cfb2 Fixed error if a non-BEV vehicle is in an HPXML file (added base-vehicle-multiple.xml). Moved warnings from ruby to Schematron. Fixed documentation/schematron schedule element names and other misc cleanup. ca177ef4d67c Latest results. bf378b857425 Update tests to account for new EV fraction charged at home default. 23c4f1c22e39 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 75e75ed5c91c Prevent empty Battery fields in HPXML for Vehicles; better EV charging fraction default. c9b078d9d45e Latest results. 6cd64a04cc75 Merge remote-tracking branch 'origin/master' into ev_batteries 885197e29f2b Use normalized schedules for EV charging and discharging. 0a1b6aa8b9bc Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 0dcda091b2d8 Restrict number of BEVs in schematron. a3283a67fad7 Latest results. 7be4e1034b7b Update vehicles sample file names. 0c4e705d3417 Require charging and discharging schedules for EVs, but a single schedule for home batteries; add back EV plug load default schedules that differ from EV default schedules. 8c6e27538408 Docs and warnings cleanup for EVs; new check for unexpected vehicle type. ed998a786596 Set up Vehicles HPXML method to allow for other vehicle types. 9337c3b81b4f Update documentation related to Vehicles. 17cf3de71c67 Update shematron for Vehicle fields. 0ce500f9ba9e Refactor method to generate battery columns in schedule files. 1bf1a41b29cd Fix typos 9457cfa18d95 Merge remote-tracking branch 'origin/master' into ev_batteries 55d09f02db69 More updates stemming from EV BuildResidentialHPXML argument changes. 234929467754 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries deb1c22c7c76 Update BuildResidentialHPXML measure args. 0414143094b3 Latest results. 9b24b18cc24a Minor unrelated improvement to make sure all HPXMLs with garages get assigned garage doors. 42be41782cf0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 307dad078ab4 Latest results. f49ce9ace5bf Address more warnings for workflow tests. 5070b3d231b6 Catch unmet driving hours warning in workflow tests. 5ed14951cc9b Fix warning check in workflow tests. 0bff0a9979b2 Clean up measure and test code for EVs and chargers 39492f37dff3 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries c6db1aceb242 Allow EV charger without an EV battery. d8605a906c71 Latest results. d9ffc48fc78b Fix schematron check for EV charging location. 0ff6acbe059f Update Changelog. 4892769672d1 Merge remote-tracking branch 'origin/master' into ev_batteries 35104b21b8d3 Remove unused sample xml. 792f79ea28c0 Update schematron for BEVs and chargers. 5e5e107c4fe0 Test for multiple battery types, EV and home. e444f74b08ca New unit tests for EV and charger default values. d44ac9962b05 Fix incorrect if statement in resilience reporting. 2292c06fd4c5 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 4776c31c92f8 Update docs and inline comments for EVs and chargers; remove roundtrip EV efficiency argument; update some constants. 9af936f2dd60 Latest results. 922cdea3e14b Ensure only one EV ruleset charging or discharging schedule is generated. 83d9148fb72b Refactor calculation of effective and rated EV discharge power. Update default EV schedules. b8c6ab50cc6f Clarify argument descriptions for EV battery and EV plug load. 2c84e016d0c6 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 23edb3036e05 Move logic to request EV discharge energy output; throw warning for unmet driving hours. c27fde0509aa Latest results. f0976f03710b Merge remote-tracking branch 'origin/master' into ev_batteries 8c2772e0fd39 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries d16f0d11db1b Drop vehicle type output and move unmet driving hours to UHT; add test for EV with unmet hours. 71cdc88d73aa Latest results. 22344b0e81a4 Set EV rated power output during model generation using miles, hours, and efficiency. 859d4f512891 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 4cdcad3b0de8 Add schematron rules for EVs; drop discharge power input for EVs. e0b8da9beed3 Latest results. 0c5982fbaa45 Fixed CI failure? And some code cleanup. dae014e1e9b7 A little cleanup. e461f260d029 Fixed CI failures? 81fa92849e4e Accommodate new output. 1c202296c814 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 5d3eeae55430 Always load EV discharge energy variable to adjust electricity meter. d0bbdd47ae3b Add check to avoid always trying to report unmet driving hours 8b29eabca5c6 New EMS variable to track unmet driving hours, report with Vehicle Type outputs. caf81147f923 Merge remote-tracking branch 'origin/master' into ev_batteries ff1791692aaa Account for vehicles specified as EV batteries and as plug loads 532abc23698e Pull in latest HPXML schema changes to vehicles 67401df427dc Merge remote-tracking branch 'origin/master' into ev_batteries 7452d7060243 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 5101e71d9acc Default schedules for EV batteries and EV plug loads d7e8f282f7f5 Merge branch 'master' into ev_batteries 5d21764326f3 Merge remote-tracking branch 'origin/master' into ev_batteries 962797a7aa73 simplify access to vehicle objects when applying to model; some cleanup e032b3e5f78e Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 14718f5bcdab refrain from using object id to check if a battery is for a vehicle 18bf8fcd27b6 Latest results. d17000ee9805 Include reporting measure arguments to trigger vehicle outputs 28e1849bdd1c fix bug for vehicles in the reporting measures 32e567b1ffcf apply RuboCop 486f01fe7a63 Merge remote-tracking branch 'origin/master' into ev_batteries 385c67b6e3ce new reporting measure class to output vehicle-specific variables that are not end-uses; move discharging energy from end-uses to this class 59d55948ad9c discard EMS for offsetting EV discharge energy and handle it directly in the reporting measure cbc7fa118f33 Bugfix. 9c373dfc46d8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 1198abdd6e89 pull in latest HPXML schema 8cc6c937dbd3 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 50a8c47d6380 prevent EVs modeled with a plug load and a battery at the same time 1e89f0600061 Latest results. 357509ed95c1 fixes for timeseries tests of EVs ed8cc5b1c92d Merge remote-tracking branch 'origin/master' into ev_batteries 14f026ec7b28 address unit test failures for EV batteries aaecf51607c9 update in-line documentation for vehicles and batteries 52d07ddf3fae Fix unit tests for EV batteries d591cad7673f Merge remote-tracking branch 'origin/master' into ev_batteries a5a3fc7fa954 Fix merge conflict 7d04943785b1 Pull in latest HPXML schema for EVs ea3d06f2f617 Merge remote-tracking branch 'origin/master' into ev_batteries d0a554f749d8 Apply rubocop b2d226a606eb Fix bug iniitalizing DBT sensor 2bfc0f7b2387 Fix for EV discharge offset object when EV location is garage 3291f9c659a1 Write EV fraction charged at home to HPXML 891f6095af38 Introduce miles/yr and hours/wk arguments for EVs, calculate the effective discharge power 0c8861cf6e2d Pull in latest Vehicles changes in HPXML schema, update HPXML classes as needed; expose fuel economy and vehicle miles traveled args 9c31908f1291 Merge remote-tracking branch 'origin/master' into ev_batteries 2432bfb168de EMS program to adjust effective EV discharge power and offset that discharge power for reporting a4135347c871 Update reporting measure to output EV energy b1ef026fc632 Generate an ELCD object for each EV battery 5d21e323428b Update EV arguments for latest approach to argument handling 3228c7ae14c4 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries b86a506dbef6 Merge remote-tracking branch 'origin/master' into ev_batteries e279ea4426b1 Latest results. cefa4e287391 Merge remote-tracking branch 'origin/master' into ev_batteries 35e8be48fd7e fix failing tests for ev batteries bd3fbfe6f4e1 Merge remote-tracking branch 'origin/master' into ev_batteries 6fbd4f57cc1a update unit tests for EVs and chargers; apply rubocop 1effbc829742 Merge remote-tracking branch 'origin/master' into ev_batteries f6b88a304f97 Refine inputs for EV battery and charger, update tests 0056e2c66d95 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 22f00b2e2fe6 Merge remote-tracking branch 'origin/master' into ev_batteries 61d39b673614 Seperate EVs from batteries and leverage existing EV charger fields dd4d5cfffa75 Merge remote-tracking branch 'origin/master' into ev_batteries 2a9b7bb67081 Latest results. 374aae8500fc fix test for battery log message 357ba18decad Merge remote-tracking branch 'origin/master' into ev_batteries da8dc17703f1 update log message tests for batteries 9db3aebb317f add missing ev battery schedule for tests 52bc3ab47b43 Merge remote-tracking branch 'origin/master' into ev_batteries 8f33e3d0556d initial tests for ev batteries 01437d08f71b always require schedule when modeling ev batteries 5c36fcb14831 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 210c463549cc make ev_battery_preset argument optional 4f1a37e0f810 update how battery ids are assigned in xml 744ad6638cfc stub out defaults for EV batteries 3f9437415304 allow one EV and one non-EV battery in schema 08c8c5a2b697 fix ev battery schedule generation, generalize for ev and non-ev battery schedules 36492fbf179d custom schedule columns for EV batteries 7b651b013676 new arguments and method to write EV battery to xml git-subtree-dir: resources/hpxml-measures git-subtree-split: ed9269ef9a0497c040e92d50ece409141f44a287
20 tasks
…e6aa418 a784be6aa418 Merge pull request #1757 from NREL/ev_schedules 3e45c3472255 Latest results. 1a72648ab5ac Update changelog, docs, sample file name. 90948d52dc24 Some cleanup and formatting. d84d5e86d603 Latest results. 26c6b0d83212 Latest results. a0cd8eb33831 Merge pull request #1915 from NREL/schedules_v2 93fe56237784 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules 2b84101c75c7 Merge branch 'ev_schedules' into schedules_v2 8aba2a12c42e Merge branch 'ev_batteries' into ev_schedules de91252a8f37 Latest results. 4d479fb4a682 Combine EV charging and discharging together 41d4f35f286b Add stochastic ev schededule to sample files 5d06aca861d3 Latest results. f7f00d9953ba Merge branch 'ev_schedules' into schedules_v2 49adc61564aa Typo fix and column name fix dd268492b0b9 Update xml file name 8c3d3307e403 Merge branch 'ev_schedules' into schedules_v2 80e4d97b620b Merge branch 'ev_batteries' into ev_schedules 6fd4f4fce824 Update hpxml and schedule for mf building 776d85574f96 Merge branch 'ev_schedules' into schedules_v2 916d87d1a6af Merge branch 'ev_batteries' into ev_schedules 4eb1ca1f1643 Merge branch 'ev_schedules' into schedules_v2 543db3801db6 Latest results. d8db876042fe Remove byebug and fix tests 6fd196899d85 Ceiling fan bug fix 928173674666 Fix BuildResidentialScheduleFile/tests b6f4d12e4781 Merge branch 'ev_batteries' into ev_schedules 45fca622e5e6 more test fixes 885c8ba5efca Merge branch 'ev_batteries' into ev_schedules 564bfb768ee7 Update tests 3c76f693514b Remove hardcoded index from test d488e4cfaded Create occupancy schedule upfront b360063bad86 remove bybug and update schedules c448160ab950 Conditionally generate plug load and garage lighting schedule 9a02a07c6468 Commit schedule file changes 57613bfcc07a Generate schedules only for things that exist 1970d681172d Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules c6bd4677a3d3 Only generate EV related schedule columns if EV is present 5769f964a781 Fix git diff command c592ec74a408 --stat overrides --exit-code, so need to use two separate calls 48a5fd4499a5 Final cleanup/revert. 112553b93e3c Add checks for schedule CSVs ec7b7902bc9e sigh addc070a67ad Updated the wrong one 06b6e44ee454 Oops. f18ec530f194 Debug CI failure 45d14051a9d4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules b81f29d34bef Rever allowing duplicate columns 6e963ae58f6a Fix schedule test 7b37014102f5 update measures d4bcffa95fe4 Merge branch 'ev_batteries' into ev_schedules 7b192742f62d Final cleanup and verified restoration of functionality 2f1f76d13104 Rename and reorder bea57ba8595f Rename and reorder 30ff4a7c50f5 Refactor schedule generator 127e47cf90ed Update warning message 40ad8e8916f5 Merge branch 'ev_batteries' into ev_schedules 30da3d89f417 Allow override when duplicate column names exist. 115064069879 Fill in function signatures 313b6d6187f0 Add unavailable periods entry for new columns bcd352f07805 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules 57e820f750b2 Update measures, fix CI error. 8c2182566f66 Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules 41ec1dbc1ed7 No EV bug fix and formatting 2204599f2bc7 Use floating division to prevent rounding to zero 3026165dee5a Merge branch 'ev_batteries' into ev_schedules bffc05be127b Schedule aggregation bug fix bb2036facf85 Merge branch 'ev_batteries' into ev_schedules 997fbeec56b4 Merge branch 'ev_batteries' into ev_schedules 8131ce2f33f4 Remove byebug line 9e03d1d0f39f Merge branch 'ev_batteries' into ev_schedules b077dcc5043d Bug fixes and enhancement 86144f9da7b7 Merge branch 'ev_batteries' into ev_schedules d15baa186632 Output EV occupant occupancy b102371faf29 Handle hours per week 3c867be6e4a3 Remove epw arguments 5230cc0ad39d fix bug from merge conflict d78b0aed6cce Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules 25d24d5a84f9 Merge branch 'ev_batteries' into ev_schedules fd0dd492dee2 Binary occupancy d08ba63913fa Merge branch 'ev_batteries' into ev_schedules d44e1bcfea43 Handle schedule conflict ce9ff761e00e Merge branch 'ev_batteries' into ev_schedules d377d3c6789a Merge branch 'ev_batteries' into ev_schedules d5db465f20a9 Fix test and read from HPXML be21d3c02110 Merge branch 'ev_batteries' into ev_schedules 19740a71b275 Generate EV schedules git-subtree-dir: resources/hpxml-measures git-subtree-split: a784be6aa418068b868f2ca24083f1759b5ff0af
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
Keep ResStock up-to-date w/the master branch of OpenStudio-HPXML.
Related Pull Requests
Pulls in:
output_metersyml field Requesting user-defined output meters buildstockbatch#482vehicleandev_chargerarguments to ResStockArgument's exclude list (these will be enabled in a separate PR)Checked means that something in resstock was changed or updated as a result of pulling in.
Related Issues
[What issue(s) is the PR addressing]
Checklist
Required:
Optional (not all items may apply):
openstudio tasks.rb update_measureshas been run