Nrcan merge #1832

ckirney · 2024-10-18T17:03:34Z

Pull request overview

Incorporate changes from nrcan branch into master including:
-ability to set primary and secondary boiler fuel type and capacity ratio based on input parameter
-ability to set SHW fuel based on input parameter
-inclusion of FuelOilNo2 SHW tank
-resolving merge conflicts

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

…erge_into_nrcan

…upports Ruby 2.7.

…turalGas or Electricity if a HP primary heating fuel is used with a vintage building.

… NaturalGas or Electricity if a HP primary heating fuel is used with a vintage building.

Updated BuildingType

…ction objects. Updating qaqc_report_expected_result.json to match new results.

… test_necb_qaqc_reporting.rb output. The openstudio-standards revision number changes with every commit causing the test to always fail.

…ts to revised cop_heating_to_cop_heating_no_fan method.

…an_merge_into_nrcan

…e_into_nrcan

…est.

updated docs

Including further changes from master into nrcan code

Include updates from nrcan branch into merge branch

…bility to define boilers of dissimilar fuel types and adjust their relative capacities.

…tap_cli test.

…lar fuel types in ECM class. Removing some redundant arguments from ECM class. Fixing method that determines the boiler capacity ratios from the boiler_cap_ratio argument.

… heaters use hot-water.

…hods. Update the system tests to include the backup boiler fueltype.

…ts to include additional backup boiler fueltype argument.

…nents' method calls in some additional tests.

…ed results.

typo in docker command

Added instructions for debugger

fixed typo.

Added tip on increasing terminal history.

Including updates from nrcan branch

Merging changes from nrcan into merge branch

…tory not in master

ckirney and others added 30 commits April 5, 2024 16:40

Re-enabling disabled gems for nrcan branch.

593a700

Merge remote-tracking branch 'origin/nrcan_master_merge' into nrcan_m…

2c917c7

…erge_into_nrcan

Merge remote-tracking branch 'origin/master' into nrcan_merge_into_nrcan

049b567

Fix nokogiri gem version to 1.15.6 as it is the latest version that s…

6ab69c8

…upports Ruby 2.7.

Merge remote-tracking branch 'origin/master' into nrcan_merge_into_nrcan

45a9b98

Fix nokogiri gem version to 1.15.6 as it is the latest version that s…

fee3eec

…upports Ruby 2.7.

Updating SHW unit test results.

04ca66a

Merge remote-tracking branch 'origin/master' into nrcan_merge_into_nrcan

89769df

Adding method which resets the primary heating fuel type to either Na…

4516329

…turalGas or Electricity if a HP primary heating fuel is used with a vintage building.

Merge branch 'master' into nrcan_merge_into_nrcan

10d1a2d

Modifying method which resets the primary heating fuel type to either…

d4b163b

… NaturalGas or Electricity if a HP primary heating fuel is used with a vintage building.

Adding qaqc report test.

b96f795

Slightly adjusting error message for test_necb_qaqc_reporting.rb.

00780a3

Merging nrcan changes into merge branch with master.

f516f9b

Update LEEPMidriseApartment.osm

d093588

Updated BuildingType

added standards building type to LEEP models

4ca5b39

Updating necb_qaqc.rb to convert construction_base objects to constru…

79d1bfd

…ction objects. Updating qaqc_report_expected_result.json to match new results.

Replacing the openstudio-standards revision number with "test" in the…

0e4fd82

… test_necb_qaqc_reporting.rb output. The openstudio-standards revision number changes with every commit causing the test to always fail.

Replacing the openstudio-standards revision number with "test" in the…

28b64e6

… test_necb_qaqc_reporting.rb output. The openstudio-standards revision number changes with every commit causing the test to always fail.

Adjusting VRF code to accommodate changes to COP and EER conversions.

3260ee5

Fixing coil_heating_dx_sindle_speed_apply_cop to send correct argumen…

89c04ea

…ts to revised cop_heating_to_cop_heating_no_fan method.

Merge remote-tracking branch 'origin/nrcan_merge_into_nrcan' into nrc…

99598ef

…an_merge_into_nrcan

Initial commit

908bacf

Initial implementation and sample test for the generalized tester

2ef6cbe

Comments for future reference and refactoring

147f798

Removed now redundant variable reference_hp

71fe569

Merging changes from master in nrcan_merge_into_nrcan.

62bf337

Including btap_data reporting test.

9427b76

Merge remote-tracking branch 'origin/nrcan_data_test' into nrcan_merg…

4384cac

…e_into_nrcan

Inculding updated qaqc reporting test and new btap_data.json report t…

3c37aaa

…est.

Phylroy Lopez and others added 25 commits September 17, 2024 18:27

added vscode documentation

5b4423b

Update vscode.md

982ad87

updated docs

Merge pull request #1813 from NREL/master

9b91377

Including further changes from master into nrcan code

Merge pull request #1814 from NREL/nrcan

caf77a4

Include updates from nrcan branch into merge branch

Merging nrcan_436 into nrcan_master_merge branch. This includes the a…

b7b6832

…bility to define boilers of dissimilar fuel types and adjust their relative capacities.

Adding boiler fuel and capacity ratio options to run_options.yml in b…

b58610a

…tap_cli test.

Enabling support for custom boiler fuel types and boilers with disimi…

8d25230

…lar fuel types in ECM class. Removing some redundant arguments from ECM class. Fixing method that determines the boiler capacity ratios from the boiler_cap_ratio argument.

Ensuring that hot-water loops are only added in ECMs if the baseboard…

fedbf23

… heaters use hot-water.

Check if a SystemFuels object is defined before trying to use its met…

cf79430

…hods. Update the system tests to include the backup boiler fueltype.

Updating the 'setup_hw_loop_with_components' method calls in unit tes…

de18932

…ts to include additional backup boiler fueltype argument.

Updating nrcan_master_merge branch with boiler changes from nrcan_436.

db3b7fd

Adding backup boiler fueltype parameter for 'setup_hw_loop_with_compo…

7ab9da9

…nents' method calls in some additional tests.

Merge remote-tracking branch 'origin/nrcan_436' into nrcan_master_merge

d727490

Updating regression test expected results and report unit test expect…

ef3711c

…ed results.

Update vscode.md

40a89dd

typo in docker command

Update vscode.md

702ab4e

Added instructions for debugger

Update vscode.md

a24f693

fixed typo.

Update vscode.md

11197fa

Added tip on increasing terminal history.

Merge pull request #1817 from NREL/nrcan

36d66cd

Including updates from nrcan branch

Merge branch 'master' into nrcan_master_merge

aaa0f1e

Merge remote-tracking branch 'origin/master' into nrcan_master_merge

da6d6db

Updating regression tests results to account for revisions to code.

e8a0d2e

Merge pull request #1830 from NREL/nrcan_master_merge

0bb0568

Merging changes from nrcan into merge branch

Removing devcontainer and additional time series file from main direc…

dabf132

…tory not in master

Removing require statements for gemfiles not used in master.

4301342

ckirney requested a review from mdahlhausen October 18, 2024 17:03

reimplement Eric's schedule changes

e00bd37

mdahlhausen approved these changes Oct 20, 2024

View reviewed changes

mdahlhausen merged commit 365db46 into master Oct 20, 2024
1 of 2 checks passed

ckirney deleted the nrcan_merge branch October 21, 2024 16:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Nrcan merge #1832

Nrcan merge #1832

ckirney commented Oct 18, 2024 •

edited by mdahlhausen

Loading

Nrcan merge #1832

Nrcan merge #1832

Conversation

ckirney commented Oct 18, 2024 • edited by mdahlhausen Loading

Pull request overview

Pull Request Author

Review Checklist

ckirney commented Oct 18, 2024 •

edited by mdahlhausen

Loading