Merge nrcan changes into master #1721
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
* removing PERFORM_STANDARDS variable * Add UEF to EF conversion. * Missing argument. * Remove simple glazing constructions and adapt code to handle it; Picking up Rubocop fixes in other files. * Fix regex issue. * Update material name in constructions. * Ok, this time last missing renaming to do. * Address issues with arguments. * Add tests, misc formatting changes. * Fix typos. * Missing argument. * Remove unecessary assertion. * Update performance test results. * Update regression models. * Fix typo. * use descriptive water heater variable names rubocop suggested changing ef to energy _factor. descriptive name changes: ef -> energy_factor uef -> uniform_energy_factor water_heater_eff -> water_heater_efficiency re -> recovery_efficiency * replace schedule_ruleset_annual_min_max_value * replace schedule_constant_annual_min_max_value * move Standards.ScheduleConstant.rb methods schedule_constant_annual_equivalent_full_load_hrs -> schedule_constant_get_equivalent_full_load_hours get_8760_values_from_schedule_constant -> schedule_constant_get_hourly_values note that the get_8760_values_from_schedule_constant method added an extra 24 hours for holiday schedules, but those extra hours are never used in the code. It's only used with ScheduleRuleset returns. * replace schedule_compact_annual_min_max_value schedule_compact_annual_min_max_value -> schedule_compact_get_min_max add generic schedule_get_min_max method * replace schedule_compact_design_day_min_max_value schedule_compact_design_day_min_max_value -> schedule_compact_get_design_day_min_max * fix method call error in prm test helper * replace variable public_send with case statement * move schedule ruleset design day min max and eflh day_schedule_equivalent_full_load_hrs -> schedule_day_get_equivalent_full_load_hours schedule_ruleset_design_day_min_max_value -> schedule_ruleset_get_design_day_min_max schedule_ruleset_annual_equivalent_full_load_hrs -> schedule_ruleset_get_equivalent_full_load_hours + schedule_get_design_day_min_max + schedule_get_equivalent_full_load_hours + schedule_constant_get_design_day_min_max - removed old tests for schedule ruleset methods simplified some sections of code with switch statements depending on schedule type to the generic schedule_get method * stub parametric schedules file * OpenstudioStandards::Schedules not OpenStudioStandards::Schedules * move schedule_ruleset_annual_hours_above_value schedule_ruleset_annual_hours_above_value -> schedule_ruleset_get_hours_above_value also fixed method because it was giving total eflh, not the sum of hours above a value * override area for failing ffactor cons * add schedule_get_hourly_values replace two methods: schedule_ruleset_annual_hourly_values -> schedule_ruleset_get_hourly_values get_8760_values_from_schedule_ruleset -> schedule_ruleset_get_hourly_values both of the methods failed the tests to get the proper values. schedule_ruleset_annual_hourly_values averages values at 15, 30, 45, which will improperly weight value changes not at 15 min intervals. get_8760_values_from_schedule_ruleset assumed schedules have fixed intervals, which likely won't be true in cases of splines or ramps for custom parametric schedules the new method schedule_ruleset_get_hourly_values uses the smallest time interval in a day schedule to calculate the averages, which is more accurate. calls to the old methods replaced with the generic schedule_get_hourly_values additionally: - get_8760_values_from_schedule + schedule_day_get_hourly_values + schedule_get_hourly_values * Update prm_test_helper.rb * Update prm_test_helper.rb * add pvav gas enumerations * refactor Standards.Model schedule methods model_add_schedule_type_limits -> create_schedule_type_limits model_add_constant_schedule_ruleset -> create_constant_schedule_ruleset * Add error checking, then check library. Add unit test. * Don't add U/SHGC/VT props to the name of SG materials. * Perf tests. * fix keywork arg call * Update regression models. * Update ashrae_90_1_prm.SpaceType.rb space_type_properties['lighting_space_type'] should be space_type_properties['lpd_space_type'] * add module descriptions for YARD docs * minor rubocop fixes * fix misspelling intialize -> initialize * Update space_type_blend.rb * add guard clauses to schedule_ruleset methods * enforce PRM model to have a non-leap year * rubocop edit to log message * fix incorrect vestibule floor area check * Enabling include statements and gems used by nrcan. * Removing redundant hdd for climate data reporting. * Resolving some formatting issues and updating weather test results to inculde case when weather download test is not run first. --------- Co-authored-by: Macdonald, Iain <iain.macdonald@nrc-cnrc.gc.ca> Co-authored-by: Lerond, Jeremy <jeremy.lerond@pnnl.gov> Co-authored-by: Jeremy L <5149279+lymereJ@users.noreply.github.com> Co-authored-by: Matthew Dahlhausen <matthew.dahlhausen@gmail.com> Co-authored-by: Eric Ringold <ericringold@gmail.com>
…ts until a more durable fix is implemented.
…rarily added back to nrcan branch.
…e an error when a storey has no spaces associated with it.
nrcan_414: issue re NV
Incorporating natural ventilation fix from nrcan branch.
…g used in ECM HS14" This reverts commit 27187e9.
Merging nrcan_3.7.0 into nrcan branch
Update LEEP osm files
…ed an estimate for the pipe diameter of ~0.019 m. This value results in very large velocities through the pipes and a very large estimate for the pump power. This approach is replaced with using a recommended value for the maximum velocity through the pipes and then finding an appropriate pipe diameter.
…est from merge branch.
# Conflicts: # data/standards/test_performance_expected_dd_results.csv
mdahlhausen
changed the title
The BTAP geometry wizard no longer exists; these tests were moved to modules/geometry/test_geometry_create_shape.rb
|
I updated the regression tests so they should work now. However, I found that the 'test_NECB2020_shw_gas_efficiency_standby_losses' test in 'test_necb_waterheater_rules.rb' fails. Specifically here: which ultimately fails here: I believe this has to do with the changes from PR# 1718 (#1718). Unfortunately, I won't have time to look into further until late next week or later. I'd rather fix this issue but I suppose we can skip the test for now and I can look into it later when I have more time. |
mdahlhausen
approved these changes
Apr 7, 2024
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 overview
Merging changes and fixes in nrcan branch into master. Also, updating nrcan test results regarding cop changes and changes from move to OS 3.7.0.
Pull Request Author
bundle exec rake doc)bundle exec rake rubocop)requirestatements, ensure these are in core ruby or add to the gemspecReview Checklist
This will not be exhaustively relevant to every PR.