Merging changes to master into nrcan branch #1670

ckirney · 2024-01-18T16:26:20Z

Pull request overview

Fixes #ISSUENUMBERHERE (IF THIS IS A DEFECT)

Pull Request Author

Method changes or additions
Data changes or additions
Added tests for added methods
If methods have been deprecated, update rest of code to use the new methods
Documented new methods using yard syntax
Resolved yard documentation errors for new code (ran bundle exec rake doc)
Resolved rubocop syntax errors for new code (ran bundle exec rake rubocop)
All new and existing tests passes
If the code adds new require statements, ensure these are in core ruby or add to the gemspec

Review Checklist

This will not be exhaustively relevant to every PR.

Perform a code review on GitHub
All related changes have been implemented: method additions, changes, tests
Check rubocop errors
Check yard doc errors
If fixing a defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
If a new feature, test the new feature and try creative ways to break it
CI status: all green or justified

…ing up Rubocop fixes in other files.

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

Add Uniform Energy Factor conversion

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.

schedule_compact_annual_min_max_value -> schedule_compact_get_min_max add generic schedule_get_min_max method

schedule_compact_design_day_min_max_value -> schedule_compact_get_design_day_min_max

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

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

fix keywork arg call

Simple glazing cleanup

space_type_properties['lighting_space_type'] should be space_type_properties['lpd_space_type']

fix misspelling intialize -> initialize

Fix minor log message in PRM lighting

Refactor/schedules module

Minor documentation fixes

fix incorrect vestibule floor area check

enforce PRM model to have a non-leap year

…back into nrcan.

Updating merge branch from master

… inculde case when weather download test is not run first.

… include case when weather download test is not run first.

IainMacdonald and others added 30 commits October 12, 2023 13:16

removing PERFORM_STANDARDS variable

efd55b5

Add UEF to EF conversion.

024a657

Missing argument.

eb11c9f

Remove simple glazing constructions and adapt code to handle it; Pick…

c8479fa

…ing up Rubocop fixes in other files.

Fix regex issue.

6c8cbed

Update material name in constructions.

d42c524

Ok, this time last missing renaming to do.

cfb522d

Address issues with arguments.

45988a5

Add tests, misc formatting changes.

0617e1d

Fix typos.

db682f7

Missing argument.

c3bd16b

Merge branch 'master' into simp_glaz_mod

c991f4e

Remove unecessary assertion.

45bf365

Update performance test results.

503ac81

Update regression models.

554d7af

Fix typo.

68c3136

use descriptive water heater variable names

093050e

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

Merge pull request #1633 from NREL/uef_conversion2

cea7e58

Add Uniform Energy Factor conversion

replace schedule_ruleset_annual_min_max_value

0b5dda6

replace schedule_constant_annual_min_max_value

4a487bc

replace schedule_compact_annual_min_max_value

abec401

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

e0288fa

schedule_compact_design_day_min_max_value -> schedule_compact_get_design_day_min_max

fix method call error in prm test helper

064fadb

replace variable public_send with case statement

376aa5d

stub parametric schedules file

12b380a

OpenstudioStandards::Schedules not OpenStudioStandards::Schedules

2335506

move schedule_ruleset_annual_hours_above_value

b370586

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

266e4da

lymereJ and others added 28 commits January 6, 2024 12:36

Perf tests.

0cd1b71

fix keywork arg call

12bb116

Merge pull request #1653 from NREL/fix/pvav_gas

1c85457

fix keywork arg call

Update regression models.

fad17de

Merge pull request #1640 from NREL/simp_glaz_mod

c1fbb2f

Simple glazing cleanup

Update ashrae_90_1_prm.SpaceType.rb

3954a05

space_type_properties['lighting_space_type'] should be space_type_properties['lpd_space_type']

add module descriptions for YARD docs

27bbeb7

minor rubocop fixes

5378e73

fix misspelling intialize -> initialize

fcd176f

Update space_type_blend.rb

963f536

add guard clauses to schedule_ruleset methods

8b7c792

enforce PRM model to have a non-leap year

df217d9

rubocop edit to log message

a626957

Merge pull request #1659 from NREL/fix/issue1617

667c7d1

fix misspelling intialize -> initialize

Merge pull request #1657 from NREL/fix/issue1637

75dd6f5

Fix minor log message in PRM lighting

fix incorrect vestibule floor area check

9b80a1f

Merge pull request #1656 from NREL/refactor/schedules_module

f0be45c

Refactor/schedules module

Merge pull request #1658 from NREL/fix/docs

24a9c23

Minor documentation fixes

Merge pull request #1662 from NREL/fix/issue1554

6823afd

fix incorrect vestibule floor area check

Merge pull request #1660 from NREL/fix/prm_leap_year

6455307

enforce PRM model to have a non-leap year

Updating nrcan_403 with nrcan branch changes in preparation to merge …

7f7dbfb

…back into nrcan.

Merge pull request #1667 from NREL/nrcan

f6920e1

Updating merge branch from master

Merging nrcan_403 into merge branch.

80a5c6e

Merging changes from master.

21872cc

Enabling include statements and gems used by nrcan.

b393189

Removing redundant hdd for climate data reporting.

787ffc1

Resolving some formatting issues and updating weather test results to…

82bf6c6

… inculde case when weather download test is not run first.

Resolving some formatting issues and updating weather test results to…

aa31d13

… include case when weather download test is not run first.

ckirney merged commit 5c53ffe into nrcan Jan 18, 2024
0 of 2 checks passed

ckirney deleted the nrcan_merge_into_nrcan branch January 19, 2024 17:04

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging changes to master into nrcan branch #1670

Merging changes to master into nrcan branch #1670

ckirney commented Jan 18, 2024

Merging changes to master into nrcan branch #1670

Merging changes to master into nrcan branch #1670

Conversation

ckirney commented Jan 18, 2024

Pull request overview

Pull Request Author

Review Checklist