Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating nrcan_master_merge branch from master #1639

Merged
merged 190 commits into from
Nov 16, 2023
Merged

Updating nrcan_master_merge branch from master #1639

merged 190 commits into from
Nov 16, 2023

Conversation

ckirney
Copy link
Collaborator

@ckirney ckirney commented Nov 16, 2023

Pull request overview

Include updates from master into nrcan_master_merge. Preparing to test against OpenStudio 3.7.0-rc2

Pull Request Author

Chris Kirney

  • 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

weilixu added 30 commits May 2, 2023 22:12
@weilixu
research
3b12969
@weilixu
Fix bug -> when expanding the / adding new window, the construction i…
c9b18f3 
…s not assigned, which cause the incorrect baseline construction assignment, and ultimately energyplus simulation failure.
@weilixu
add warning and handle missing defaultConstructionSet with exception.
78ec223
@weilixu
Add assertion function
0fe207d
@weilixu
update the text,
f59af57
@weilixu
Update the logic based on comments
d162f5f
@weilixu
add function to handle user data inputs for OA
0c13fb4
@weilixu
run CI
c85f6a1
@weilixu
add read user data function to read user data with default value assign
2373bd2
@weilixu
add message for TODO
06716c0
@weilixu
Merge pull request #1507 from NREL/wx_bug_fix_fenestration_expansion_…
ba7ab64 
…missing_construction_name

Wx bug fix fenestration expansion missing construction name
@weilixu
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
7b9a475 
…andards into wx/baseline_oa
@weilixu
Update adding the function to check user data for outdoor air specifi…
503a216 
…cation

Add assertions for getting data from additional properties
Add new file import in openstudio-standards.rb
Add new process in the master function under Standards.Model.rb
@weilixu
add handeler to handle the get situation - will likely to do it for e…
402670d 
…very case.
@weilixu
update optional handler to simpify the call stack
156ca94
@weilixu
add log for data conversion
33b729e
@weilixu
no message
dadcb62
@weilixu
add test case
e42b68a
@weilixu
Fix error in the assertion function
fcdf723
@weilixu
update the prm_raise
bc32ec1
@weilixu
Merge pull request #1514 from NREL/wx/baseline_oa
51dd654 
Wx/baseline oa
@weilixu
Merge pull request #1532 from NREL/wx/baseline_oa
8a1ecff 
update the prm_raise
@weilixu
Complete run four orientations
d141592
@weilixu
Merge pull request #1533 from NREL/appx_g/enhancement/run_four_orient…
62249d8 
…ations

Complete run four orientations
@weilixu
add new assertion function
d97effc
@weilixu
added logs
e552542
@weilixu
update the output log message
31f8819
@weilixu
update with logs and error message
b2e45fa
@weilixu
Merge branch 'AppendixG_Dev' into appx_g/enhancement/model_apply_prm_…
16a2277 
…baseline_window_to_wall_ratio
@weilixu
Merge pull request #1536 from NREL/appx_g/enhancement/model_apply_prm…
acaa6c9 
…_baseline_window_to_wall_ratio

Appx g/enhancement/model apply prm baseline window to wall ratio
mdahlhausen and others added 29 commits October 7, 2023 15:53
@mdahlhausen
add qaqc methods
88b6a5e
@mdahlhausen
fix typos
12cfe90
@mdahlhausen
add part load ratio qaqc check
da09a1d
@mdahlhausen
add qaqc test
0fca84f
@mdahlhausen
Merge branch 'master' into feature/extension_gem_merge
df0485f
@mdahlhausen
add check that sql file is available
ad936d9
@mdahlhausen
add QAQC reporting
e2f937b
@mdahlhausen
add weather information module
33ba974
@mdahlhausen
adopt create_ naming
d84d42b
@mdahlhausen
add daylight sensor method
4486de5
@mdahlhausen
add more tests
471066d
@mdahlhausen
Merge pull request #1619 from NREL/feature/extension_gem_merge
0cabb31 
Feature/extension gem merge
@mdahlhausen
create_ instead of model_create_
b68abaa
@mdahlhausen
add DistrictHeatingWater and DistrictHeatingSteam
a4e4b29
@mdahlhausen
add PLF curve to water to air heat pumps
54dc5ea
@mdahlhausen
fix unitary system deprecated method warnings
39364aa
@mdahlhausen
fix hospital performance tests
f64ef99
@mdahlhausen
Merge pull request #1621 from NREL/fix/os_3_7_release
c63bbf2 
fixes for OS 3.7.0 release
@mdahlhausen
Update version.rb
682d3b2
@mdahlhausen
remove duplicate hash assignment
bae3340
@mdahlhausen
Merge pull request #1625 from NREL/fix/remove_duplicate_qsr_wwr
26b2a03 
remove duplicate hash assignment
@eringold
remove interpolate to timestep from parametric sch
e303ab0
@DavidGoldwasser
Updating license from LGBL to BSD to match OpenStudio, ext gem, and m…
90b68b9 
…easure repos
@mdahlhausen
remove Modified BSD license add
81b425d
@mdahlhausen
Merge pull request #1629 from NREL/license_update
4dee6c3 
Updating license from LGBL to BSD to match OpenStudio, ext gem, and m…
@eringold
Merge remote-tracking branch 'origin/master' into remove_sch_interp
bc2dfc1
@mdahlhausen
Update version.rb
18e3a88
@mdahlhausen
Merge pull request #1632 from NREL/remove_sch_interp
8e7e38d 
Remove timestep interpolation from process_hrs_of_operation_hash
@lymereJ
Add reference to the database repository.
829d358
@ckirney ckirney merged commit 665f068 into nrcan_master_merge Nov 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@ckirney @eringold @weilixu @lymereJ @leijerry888 @mdahlhausen @DavidGoldwasser