Latest OS-HPXML #1308
Merged
Latest OS-HPXML #1308
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
…4230706 e770f4230706 Merge pull request #1846 from NREL/misc_things 0e2efc839669 Update measure.xml b8b051b2c597 Require both FracSensible and FracLatent to be provided/omitted to fix a possible error if only one is provided and the other is defaulted. 4875c6bd42bc Add Resources section to the docs. 54ca3ac6b59a Merge pull request #1840 from NREL/ruby-docs f0f502e24943 Bugfix. f8a569bed49d Bugfix. 5db17e71f429 Missed one. 9983541d34a1 Allow tank volume to be defaulted for any water heater type. Replaces HPXMLDefaults_get_default_foo with Defaults.get_foo. Renames hpxml_defaults.rb to defaults.rb. 68b468c955dc Need a different approach for OS-ERI a0fc0ad26c32 Need this for OS-ERI c002e9460749 Rename method 8b6614ef65b5 Found more defaulting methods to move. a65b979bb6fc Update refs 1e8e3c66a7ab Move a few more defaulting methods. 7baddc9a89be Move more methods to hpxml_defaults.rb b0b826c64b6c Latest results. c79f63f159a7 Fix DHW loop pump f30506b0f90f Revert name change. 4ebb8b8e2bd3 Bugfix. 88d0a4ac3ba2 Fix edge case. 5d2e33338f06 Add error-checking code b97a728e04aa Update hvac tests, combine lights methods. 061cb373ede8 Add a few more objects to model.rb, reformat. ce0515c8d8ac Bugfix. 7b54a990c2c5 Move a few more objects to model.rb. a4c37cf1d89c Consolidate Curve and Material object creation. fbc6a6b225bb Bugfix. 298dc1f3ee9d Completed documentation of output.rb. Moved constants to constants.rb. [ci skip] e9f8ec251f87 Completed documentation for hotwater_appliances.rb [ci skip] a6e432659c94 Bugfix. f0320019233a Bugfix. 421311b6c40b Use EMS-friendly names in more places 9ef0b36b7a2e Added EMS methods to model.rb. Introduced a method that creates EMS-friendly names. Added code to prevent duplicate sensors. e82a6745a339 Bugfix. 40d31b45bc49 Fix tests. Use kwargs in new model.rb methods. 59986a8390e6 Bugfix. Prototype generic add_foo methods in model.rb. 31e7d52abd28 Bugfix. 71dc6b2cd3da A couple small things 0e0f9415fa76 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 01e6dc7b0856 Moved a bunch of HotWaterAndAppliances/WaterHeater/Airflow defaulting methods into HPXMLDefaults and added documentation. 36f1dccd6265 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 4d80de28352e Some documentation for geometry.rb b45a5f56f487 Revert measures hash not supporting lists of arguments. 50dc076c2f38 Merge branch 'master' into ruby-docs 57c3c6776e7d Update tasks after hash change. 8a18e3b85f1e Remove list of args hashes in measures hash. e8e0deac9599 Progress in geometry and meta_measure. 6485ac2cfd09 Merge branch 'master' into ruby-docs fe2e4d2db60b More TODOs in geometry resource file. 5cdc6b06429d Starting filling TODOs in meta_measure resource file. git-subtree-dir: resources/hpxml-measures git-subtree-split: e770f42307069ba1ed46467ddaee3866d2f70551
…884ed15 afdd3884ed15 Merge pull request #1851 from NREL/schedule_methods 0f2e6b7f71f0 Latest results. 6e9bbfa55373 Merge branch 'schedule_methods' of https://github.com/NREL/OpenStudio-HPXML into schedule_methods 72dab1d090f2 Bugfix for season schedule. Misc code cleanup. b41ae3de172d Latest results. 100534ab8f98 Bugfix. 1043fbf38ecc Bugfix, simplify. 7e241ad34e0b Bugfix. f6017611e80f Bugfix. ee45a26d3764 Bugfix. 858350a9ce6e Bugfixes. edf3d2df7091 update_measures 553dce92365b Add the rest of the schedule object methods to model.rb. 745026fd0e24 Merge pull request #1849 from NREL/stratified_tank_bugfix 5dc674f35596 Latest results. 80b8e17316d0 Set source side inlet/outlet heights too. 6e6a59bb75d9 Fixes the height of the lower element in the stratified tank model. git-subtree-dir: resources/hpxml-measures git-subtree-split: afdd3884ed151f1e985c90c85921d1a9eecd0548
…c4ba678 9bb1ac4ba678 Merge pull request #1856 from NREL/fix_combi_error fb92a6977df2 Latest results. e77f37a8c8f5 Fix tests. 5ffadbabf8e3 Merge branch 'fix_combi_error' of https://github.com/NREL/OpenStudio-HPXML into fix_combi_error 6fad297cb06b Update Changelog.md [ci skip] d8097bd749ee Latest results. e5d73ba4c68d Allow GSHP w/ separate backup heating system. 8438d1b91acf Update a couple HPXMLs. 905eaa823eb3 Fix possible error when there's a combi water heater. Add more error-checking to schematron. 5e5b1fbde3d8 Merge pull request #1855 from NREL/more_ruby_doc 0dbfaa0a30a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more_ruby_doc cb7e6b5abf70 Some more ruby documentation and some light code cleanup. 5b28c4363b13 Brings the `skip_simulation` arg back; forgot that BEopt uses it. 73460f97b264 Merge pull request #1854 from NREL/fix_delete 1556a63b4318 Small docs clarification. [ci skip] 53638b503199 Fixes the HeatingPerformanceDataPoint.delete method, spotted by @joseph-robertson. git-subtree-dir: resources/hpxml-measures git-subtree-split: 9bb1ac4ba678b0ef022e0f0e506346d89b141df6
…23d12d3 6980e23d12d3 Merge pull request #1865 from NREL/cfis_suppl_fan_sync f6048689189b Latest results. 83861d2afeb1 Bugfix, cleanup. 3ad779428dba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_suppl_fan_sync 9112f440b93a Merge pull request #1862 from NREL/detailed_performance_autosizing_bugfix e3f4774a3c25 Latest results. 24ca6e442ae7 Update Changelog [ci skip] 1e4ecf43c16c Latest results. ffc33cb2f486 Revert temp change. 1b5424919fd9 First pass on new SupplementalFanRunsWithAirHandlerFan input for CFIS systems. 7ee7fb6fdb78 Latest results. 217d373546a1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into detailed_performance_autosizing_bugfix 9332bad71e81 Merge pull request #1863 from NREL/cfis_oa_control 1d527a1143ac added unit test, update Changelog.md 219d26436230 Clarify emittance and solar absorptance inputs. [ci skip] c79ef9a131ab Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 06c45accbfdf Bugfix. a38d474e51a7 Latest results. 674ea6907c1d Latest results. 60e80ec15725 When a CFIS system has no outdoor air control, include outdoor air during all heating/cooling runtime. ad3465f9ec51 Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 2c9a13eefb29 Some code refactor/cleanup. e4fe01f5aa57 revert retention calculation. fd1414164bdc Latest results. 1556c50cf0b8 Update tests 47e4923e9384 Bugfix. b2a64fc3f6e0 Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 161f8709029c Some initial code cleanup; no diffs expected. f3243c405f5a Latest results. 70a5f49fe53a Update test. deb2824e850f Initial scaffolding. Still need to use it in the energy model. bd7bb390a01e one more d7de7b8f0070 update measures, and update retention as well 594ca339ebd6 bugfix for autosizing detailed performance data with fractions 27dd8ead4922 Merge pull request #1861 from NREL/utility_bills_update 24409402f46a Bugfixes: 1. Don't overwrite max usage units in the tariffs we produce. 2. Only throw an error if the max usage unit is not kWh AND a max usage value is provided. The units apply to the max value usage only, the rate value is always $/kWh; see the OpenEI URDB website for confirmation. 2de51a2a8285 Merge pull request #1857 from NREL/hpwh_capacities 5c3fc8163ffa Update Changelog.md 35ba1cbeea7f Updates utility bill calculations to allow daily fixed charges. Improves warning messages. A little code cleanup. 67301d72bdf8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_capacities 301ae67c05ce Pin ubuntu-22.04 while GitHub works on fixing ubuntu-latest. bd4bde15d4d1 Require a water heater's HeatingCapacity to be > 0. 2dd566f7e602 Merge pull request #1816 from NREL/cfis_continued 09c7cd1860d6 Fix CI 616154a2ae40 Latest results. 906db6c7e417 A little cleanup. 578929efb9e6 Merge branch 'cfis_continued' of https://github.com/NREL/OpenStudio-HPXML into hpwh_capacities bb8d8b02566a Fix CI 68a9e3fef5a4 Latest results. a2f595de286e Fixes CI? 77467c7a92cc A little docs cleanup. 40d7e9384404 Allows optional `HeatingCapacity` and `BackupHeatingCapacity` inputs for HPWHs. Defaults same as before. ca3bdf5955fb Merge branch 'cfis_continued' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued da7f96787334 Clean up docs [ci skip] 7b79e72296b7 Latest results. 1ae00d2c4067 Implement CFIS fan power defaulting. 86f4b722e273 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued d65c8a35f5f6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued 2c92a2075090 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued e4fbc89a97ef Update expected simulation results b26f7748d4e2 A few more fixes. ba1239ddf0f7 Address CI failures 28f8c4047a3b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued f98754ece383 Clean up docs/schematron related to CFIS FanPower and VentilationOnlyModeAirflowFraction inputs. git-subtree-dir: resources/hpxml-measures git-subtree-split: 6980e23d12d33fcf66f7916bbed6b5e20659cf5c
…e1802ad 76951e1802ad Merge pull request #1868 from NREL/cfis_refactor 3d7ff588cf88 Latest results. 724ca3769a95 Update tests, final cleanup. fd0b299af2b5 Update changelog [ci skip] 99e0201a4f27 update measure.xml 58ef08bb1544 Indent. d32fcfa62102 Bugfix when no outdoor air control. be95d7ddd9d1 Bugfix for SupplementalFanRunsWithAirHandlerFan=true. Rename variables for clarity. d86c05086a61 Introduce ZoneTimestep into calculations. 8893f6b5b38f Bugfix. 1f5a98e1b414 Initial pass. Still need to resolve one diff and test further w/ shorter timesteps. 9e0f85fbccb8 Merge pull request #1866 from NREL/cfis_control_type b7efd03d1f6e Increase docs width [ci skip] c342b13d3ee1 Latest results. 46be375a885d Update tests 55918cd0680a Update changelog 24b5081d176a First pass on adding CFIS ControlType input. git-subtree-dir: resources/hpxml-measures git-subtree-split: 76951e1802adb182d2ef7860fdb07daaa48ace00
…a3cac1f 1d56ca3cac1f Merge pull request #1872 from NREL/fix_dl_detailed_results 4d4fc470662d Add test. 94ddd8329aa3 Bugfix. 36350b91e004 Fixes possibility of missing surfaces in the results_design_load_details.csv output file. Bug introduced in #1836. git-subtree-dir: resources/hpxml-measures git-subtree-split: 1d56ca3cac1f823574a4266c41b352c640acaaf5
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:
update_args_hashwas removed; introduce (a modified version of) it back into buildstock.rbHeatingPerformanceDataPoint.deletemethod OpenStudio-HPXML#1854water_heater_backup_heating_capacity=autofor Water Heater Efficiency optionsHasOutdoorAirControlinput for CFIS systems OpenStudio-HPXML#1863SupplementalFanRunsWithAirHandlerFaninput for CFIS systems OpenStudio-HPXML#1865ControlTypeinput for CFIS systems OpenStudio-HPXML#1866Checked means that something in resstock was changed or updated as a result of pulling in.
Checklist
Not all may apply:
Tests (and test files) have been updatedDocumentation has been updatedIf related to resstock-estimation, checklist includes data dictionary, source report, options saturation, options_lookup.Add to the [changelog_dev.rst file](https://github.com/NREL/resstock/tree/develop/docs/read_the_docs/source/changelog/changelog_dev.rst)openstudio tasks.rb update_measureshas been run