Make housing characteristics format consistent. #353
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
In the effort to make the format more consistent for the housing characteristics and to more easily see differences in commits to the housing characteristics, the following changes have been made to all the housing characteristic files. All line terminators are '\r\n' which is consistent with Window machines. All Option columns have format %.6f. All [For Reference Only] Source Sample Size columns are type int. All [For Reference Only] Source Weight are type int.
|
Perhaps formatting should be enforced in the integrity_checks? |
|
@shorowit Good idea. Thanks for the feedback. I will update the integrity checks. |
ejhw
approved these changes
Jan 8, 2020
There was a problem hiding this comment.
@mpathak24 Heads up that this is in the works, so you may have to adopt these formatting guidelines when merging your tsv changes. (or perhaps start your PR using this branch).
| 1. All line terminators are '\\r\\n'. | ||
| 2. All Option columns have format '%.6f'. | ||
| 3. All [For Reference Only] Source Sample Size columns are type 'int'. | ||
| 4. All [For Reference Only] Source Weight columns are type 'int'. |
There was a problem hiding this comment.
Add guidelines on "Created by" line
There was a problem hiding this comment.
- Row values should sum to 1.000000.
- All combinations of dependencies are required to have values
There was a problem hiding this comment.
Are you documenting what the integrity_checks do? There are additional checks (like this one).
|
@joseph-robertson I still need to make changes to the integrity checks that check for these changes. |
…at for consistency
…g characteristics.
Resolving conflicts in Insulation Finished Roof.tsv by accepting new structure specified by master, but with the format specified in this branch. This strategy was used in each project.
The Rakefile is updated so that the file format is the last check, so other errors are thrown first. The scientific format section of the check was updated to include e-, e+, E-,and E+ instead of just e and E.
Try overriding line endings with attributes file.
|
@joseph-robertson Thanks for getting this cleaned up. |
joseph-robertson
added a commit
that referenced
this pull request
Jan 14, 2021
75c73c9884 Update tasks and generate install quality osws. 92fce432e9 Add optional airflow and charge defect ratio arguments. 4d2f346f90 Merge branch 'master' into build-res-hpxml-v3 034de682c5 Merge pull request #353 from NREL/resnet310_install_qual e646c0e932 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 30c6c82989 Remove outdated FIXME. ffbc9fdae4 Merge pull request #585 from NREL/overhangs_zero_depth c5c646af1e Update changelog. 54a88ba93c Allow overhangs with zero depth. f388e60589 Add optional args and test osw for window exterior shading. 25d9f62f45 Merge branch 'master' into build-res-hpxml-v3 57a820ff49 Rename test files and minor cleanup. 249b47112a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 698f6439f5 Merge pull request #570 from NREL/exterior_shading 92742ae107 Merge branch 'master' into exterior_shading 536934dfcf Merge pull request #568 from NREL/new_interior_shading d9d9dc2ad0 Merge branch 'master' into new_interior_shading 8e281db789 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML 330bf7aeea Fix missing ASHRAE 140 results. 411640ab50 Merge branch 'new_interior_shading' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading 106debe1e3 Update changelog. b8f4de9588 Merge pull request #579 from NREL/build-res-hpxml-v3-appl-ventfans 545feb31dc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading 8170b0249c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading 18dcf8a0dc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 846d171f9e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading 55719fb44b Cleanup comments [ci skip] c5871928d4 Update HVAC sizing. ab1e56e73f Update EPvalidator.xml. c6154db078 Adds support for exterior shading coefficients for windows and skylights. 0643c2a093 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual fc96bda6ad bugfix ab9bdce003 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading 4ab5090ea7 Address test failures. 4ae69b1999 Fixes view factor -- needs to be applied to subsurface and not surface (spotted by @bpark1327). Also updates unit tests and adds a new test file for skylights. ad6cce0aa5 Merge branch 'complex-geometry-sample-file' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading 85cb334f0e Merge branch 'complex-geometry-sample-file' of https://github.com/NREL/OpenStudio-HPXML into new_interior_shading ba5b8ef304 Progress on GSHP: implement GSHP size adjustment, some refactor, some bugfixes. 176e251731 Bugfix. 7a023e1be3 First pass on new approach. 8f723f2db0 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 42084a9106 update senscap and design cfm along with increase of totcap. Remove iteration because no longer needed. e278464c35 Update documentation & error message regarding different fan W/cfm values for heating/cooling systems attached to the same distribution system. 75a1db53c1 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual b298216aba Relax defect ratio constraints. Add some more constraints for SharedLoopWatts, FanCoilWatts, etc. 6209eb5eda Oops forgot cooling 4614c10b5d Try revealing convergence error 12ac524a46 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 96e14deef7 Updates documentation. Adds some constraints for numeric values. Removes some lingering references to AirflowCFMperTon. ba766cd7e6 iterate the rated airflow updates on size adjustment calculation dd0343e107 Merge branch 'hvac_sizing_improvements' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 07b7f0e0c4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 2d980f1e0e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 7bd70d4b71 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 542bb80145 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 3ec45f82f8 Ductless systems (e.g., room ACs, ductless mini-splits) will not have airflow or fan power measurements. 7fe1844b23 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 82595409bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 02eefc559f switched to bump up capacity instead of speed ratios, to enable the use of allow increased capacity flag. 3922728a3d temperature unit bugfix 8ae5545019 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual bugfixes 2f6ae2eca3 adjust capacity, remove actual cfm test files 31a6553c22 progress on adjusting capacity bfadce37ef Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual ccda999efb Update TODO. [ci skip] 4b28c23ada Remove W/cfm input for evap cooler. Fix CI error. c0fc940de7 bugfix d588b43b80 only allow 0 for GSHP charge defect ratio 17525b7cbb Swap base-hvac-install-qual-all-foo.xml and base-hvac-install-qual-all-foo2.xml files. 95b7c45a98 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual db2346dd7b test_hvac.rb: Some reorganization, code cleanup, and new tests. 2f594c9626 test bugfix f6183a9a75 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual d383c0c416 room ac bugfix, test 835f81a9fd room ac 991199a5da Add HVAC IQ test file for evap cooler. c1a2139ea9 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 58005c4f9b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 469aa7e8df Use Tang's E+ curve instead of DOE2 curve. 50ec46e287 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual a268eb1fe0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 8b7dfe4137 Add missing base-hvac-install-qual-all-furnace-gas-central-ac-1-speed.xml test file. Add furnace inputs to test files w/ an AC + furnace. bcec016e17 Removes FanPowerWattsPerCFM from all HPXML files other than the base-hvac-install-qual-*.xml files (which test this input). 034efd10a8 Minor changes. 5faa2b33ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual b7097dc8ff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 488745acb8 test refactor. Add EMS checks to non-iq test files 6f3ef3af8f Oops forgot a rename 0f0f39bfec Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 8219fe4f9c Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual fa660a1017 Added some unit tests and minor changes to program f2d6164ae2 rename test file to be consistent 2457568f14 Update default fan powers. 97555cc42d A little code refactoring. e63aa0312e Adds HPXML default tests. Fixes MSAC fan power defaults to be consistent with MSHPs. 54d6758e34 Renamed some test files and added a bunch of test files with airflow cfm/ton instead of airflow defect ratio inputs. ab78f816e6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual afb281ce93 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual cbbfcd2e79 Simplified inputs for non-forced air heating systems (wall/floor furnaces, stoves, portable/fixed heaters, fireplace). A little code cleanup. d8593ea2c1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 19f23b03c2 test expected values changed for applying hp curve, progress on multispeed coil system implementation c72621b890 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 59a5735f6b format d565bf1dd2 use heat pump curve for central ac eef2ba824f process heating speed ratios in hvac sizing 54320bd936 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 39359bc010 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 526ccff869 Merge branch 'resnet310_install_qual' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 212bfdb2b2 bugfixes df42423ec6 Fix CI errors. a3839f7f3c Exclude charge defect ratio for GSHPs. Exclude all inputs for room ACs. A few bugfixes and code cleanup. 85de6e4f6d Merge commit '36238c7abed4aa69e710a3ace0ff0342e3d26723' into resnet310_install_qual 888601c7bc Add remaining test files, remove old test files. c23c89d8a4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 191848e475 Merge commit 'fd97bf5b6ef108f5c61449be44bafc7537a54f63' into resnet310_install_qual 634ed05aa4 progress on two speed approach b788c016d9 added test files, and some progress 3fa85901c6 A couple bugfixes. Remove unused method. 9e4179d532 Tiny fix. [ci skip] baaf7277b4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 7cab4a0e80 Update EPvalidator.xml. Stub inputs for airflow rates (instead of airflow defect ratios) and allow inputs for additional system types. Some code consolidation and cleanup. 130f694289 rubocop [ci skip] fe8a98f4a6 Some code cleanup. Removes the duplicated Cutler curve coefficients. 70df949300 Update for MSAC. fd1d5e97e8 Some bugfixes/cleanup. 8b39c63b81 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 85f6ed2411 Bugfix. 39404a78c3 Update fan W/cfm defaults to match BEopt. Split MSHP fan_power variable into rated/installed; fixes test. edff61d53e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual c58417834d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into resnet310_install_qual 1f3e4e5358 First pass at removing Eae for furnaces in lieu of blower watt efficiency. eef285a94d RESNET Standard 310 calculations for single stage air conditioners and heat pumps and several test files. git-subtree-dir: resources/hpxml-measures git-subtree-split: 75c73c9884e3e9d1e90ff177b1afdcc4c0836af4
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
In the effort to make the format more consistent, the following format has been applied to the housing characteristics. Standardizing the format of the housing characteristics should make it easier to see differences in commits
Checklist
Not all may apply:
project_testingproject_testingruns without any failuresFor more information on how to perform these checklist items, see the documentation's Advanced Tutorial.