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

Merging changes from nrcan into merge branch #1830

Merged
merged 115 commits into from
Oct 18, 2024
Merged

Merging changes from nrcan into merge branch #1830

merged 115 commits into from
Oct 18, 2024

Commits on Apr 5, 2024

  1. Re-enabling disabled gems for nrcan branch.

    @ckirney
    ckirney committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    593a700 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

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

    …erge_into_nrcan
    @ckirney
    ckirney committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    2c917c7 View commit details
    Browse the repository at this point in the history

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

    @ckirney
    ckirney committed Apr 8, 2024
    Configuration menu
    Copy the full SHA
    049b567 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2024

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

    …upports Ruby 2.7.
    @ckirney
    ckirney committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    6ab69c8 View commit details
    Browse the repository at this point in the history

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

    @ckirney
    ckirney committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    45a9b98 View commit details
    Browse the repository at this point in the history

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

    …upports Ruby 2.7.
    @ckirney
    ckirney committed Apr 10, 2024
    Configuration menu
    Copy the full SHA
    fee3eec View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. Updating SHW unit test results.

    @ckirney
    ckirney committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    04ca66a View commit details
    Browse the repository at this point in the history

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

    @ckirney
    ckirney committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    89769df View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2024

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

    …turalGas or Electricity if a HP primary heating fuel is used with a vintage building.
    @ckirney
    ckirney committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    4516329 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into nrcan_merge_into_nrcan

    @ckirney
    ckirney committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    10d1a2d View commit details
    Browse the repository at this point in the history

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

    … NaturalGas or Electricity if a HP primary heating fuel is used with a vintage building.
    @ckirney
    ckirney committed Apr 12, 2024
    Configuration menu
    Copy the full SHA
    d4b163b View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2024

  1. Adding qaqc report test.

    @ckirney
    ckirney committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    b96f795 View commit details
    Browse the repository at this point in the history

  2. Slightly adjusting error message for test_necb_qaqc_reporting.rb.

    @ckirney
    ckirney committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    00780a3 View commit details
    Browse the repository at this point in the history

  3. Merging nrcan changes into merge branch with master.

    @ckirney
    ckirney committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    f516f9b View commit details
    Browse the repository at this point in the history

  4. Update LEEPMidriseApartment.osm 

    Updated BuildingType
    @phylroy
    phylroy authored Apr 15, 2024
    Configuration menu
    Copy the full SHA
    d093588 View commit details
    Browse the repository at this point in the history

  5. added standards building type to LEEP models

    plopez committed Apr 15, 2024
    Configuration menu
    Copy the full SHA
    4ca5b39 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2024

  1. Updating necb_qaqc.rb to convert construction_base objects to constru… 

    …ction objects. Updating qaqc_report_expected_result.json to match new results.
    @ckirney
    ckirney committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    79d1bfd View commit details
    Browse the repository at this point in the history

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

    … test_necb_qaqc_reporting.rb output. The openstudio-standards revision number changes with every commit causing the test to always fail.
    @ckirney
    ckirney committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    0e4fd82 View commit details
    Browse the repository at this point in the history

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

    … test_necb_qaqc_reporting.rb output. The openstudio-standards revision number changes with every commit causing the test to always fail.
    @ckirney
    ckirney committed Apr 16, 2024
    Configuration menu
    Copy the full SHA
    28b64e6 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2024

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

    @ckirney
    ckirney committed Apr 18, 2024
    Configuration menu
    Copy the full SHA
    3260ee5 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2024

  1. Fixing coil_heating_dx_sindle_speed_apply_cop to send correct argumen… 

    …ts to revised cop_heating_to_cop_heating_no_fan method.
    @ckirney
    ckirney committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    89c04ea View commit details
    Browse the repository at this point in the history

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

    …an_merge_into_nrcan
    @ckirney
    ckirney committed Apr 24, 2024
    Configuration menu
    Copy the full SHA
    99598ef View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. Initial commit

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed May 29, 2024
    Configuration menu
    Copy the full SHA
    908bacf View commit details
    Browse the repository at this point in the history

  2. Initial implementation and sample test for the generalized tester

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed May 29, 2024
    Configuration menu
    Copy the full SHA
    2ef6cbe View commit details
    Browse the repository at this point in the history

  3. Comments for future reference and refactoring

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed May 29, 2024
    Configuration menu
    Copy the full SHA
    147f798 View commit details
    Browse the repository at this point in the history

  4. Removed now redundant variable reference_hp

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed May 29, 2024
    Configuration menu
    Copy the full SHA
    71fe569 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merging changes from master in nrcan_merge_into_nrcan.

    @ckirney
    ckirney committed May 30, 2024
    Configuration menu
    Copy the full SHA
    62bf337 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Including btap_data reporting test.

    @ckirney
    ckirney committed May 31, 2024
    Configuration menu
    Copy the full SHA
    9427b76 View commit details
    Browse the repository at this point in the history

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

    …e_into_nrcan
    @ckirney
    ckirney committed May 31, 2024
    Configuration menu
    Copy the full SHA
    4384cac View commit details
    Browse the repository at this point in the history

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

    …est.
    @ckirney
    ckirney committed May 31, 2024
    Configuration menu
    Copy the full SHA
    3c37aaa View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Updated the generalized regression helper

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    93f5b13 View commit details
    Browse the repository at this point in the history

  2. Fixed comma

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    83f108c View commit details
    Browse the repository at this point in the history

  3. Fixed json reader and comments

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    43f6200 View commit details
    Browse the repository at this point in the history

  4. Formatting, removing unnessecary require, adjusting print statement

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4e8864e View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Added temporary replacement for getTimeSeries()

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    413dda4 View commit details
    Browse the repository at this point in the history

  2. Adjusted searching algorithm

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    2c7739b View commit details
    Browse the repository at this point in the history

  3. Simplified regex

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1803d82 View commit details
    Browse the repository at this point in the history

  4. Fixed typos

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fe6d19f View commit details
    Browse the repository at this point in the history

  5. Refactored unnecessary file loading into branching case

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fa84660 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge pull request #1754 from NREL/nrcan_data_test 

    Include btap data test and fix for reading weather files with leap years containing only 28 days of February data
    @ckirney
    ckirney authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    0f03870 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1755 from NREL/nrcan_426 

    Formatting, removing unnessecary require, adjusting print statement
    @ckirney
    ckirney authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    021db71 View commit details
    Browse the repository at this point in the history

  3. Generalizing leap year test and updating test_necb_btap_data.rb to ju… 

    …st use Toronto and updating the associated expected result file.
    @ckirney
    ckirney committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    c430af0 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1756 from NREL/nrcan_data_test 

    Generalizing leap year test and updating test_necb_btap_data.rb to ju…
    @ckirney
    ckirney authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    8fc2967 View commit details
    Browse the repository at this point in the history

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

    @ckirney
    ckirney committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    3310462 View commit details
    Browse the repository at this point in the history

  6. Updating merge branch with master with changes to nrcan branch.

    @ckirney
    ckirney committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    7776d2d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. Refactoring, modularization, removed JSON reader, added sample test

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    9f41a8f View commit details
    Browse the repository at this point in the history

  2. Refactoring and comments

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    78cd11f View commit details
    Browse the repository at this point in the history

  3. Removed redundant require 'compare_models_helper.rb'

    @nicholas-pneumaticos-nrcan
    nicholas-pneumaticos-nrcan committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    302faef View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Including tests for ecm_system_types HS08_CCASHP_VRF, HS09_CCASHP_Bas… 

    …eboard, and HS11_ASHP_PTHP. Adding a dash after the ecm_system_type to the test result names.
    @ckirney
    ckirney committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    644d133 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Support for devcontainer 

    Added support for devcontainer development for version 3.7.0
    @phylroy
    phylroy authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    72cb1cc View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Including HS12_ASHP_Baseboard and HS14_CGSHP_FanCoils ECM regression … 

    …tests and related expected results.
    @ckirney
    ckirney committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    3a81cb4 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. Adding HS13_ASHP_VRF test and including expected results.

    @ckirney
    ckirney committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c861baa View commit details
    Browse the repository at this point in the history

  2. Adding ecm tests to ci_tests.txt and removing BTAPPRE1980 regression … 

    …tests (just using BTAP1980TO2010 tests).
    @ckirney
    ckirney committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    6d565fd View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

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

    @ckirney
    ckirney committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    81de6e4 View commit details
    Browse the repository at this point in the history

  2. Adjusting CSV.open syntax to work in Ruby 3.2.2.

    @ckirney
    ckirney committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    5760c4d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1764 from NREL/nrcan_424 

    Adding ECM regression tests and new helpers for regression tests
    @ckirney
    ckirney authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    c3181a1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1765 from NREL/nrcan 

    Including changes from nrcan branch into nrcan_merge_into_nrcan
    @ckirney
    ckirney authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    73004d3 View commit details
    Browse the repository at this point in the history

  5. Update ECM regression tests to reflect changes from master.

    @ckirney
    ckirney committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    839aa82 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Merge pull request #1768 from NREL/nrcan_429 

    Removed redundant require 'compare_models_helper.rb'
    @ckirney
    ckirney authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    a08852f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1769 from NREL/nrcan 

    Nrcan
    @ckirney
    ckirney authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    9925d09 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1770 from NREL/shorten_necb_test_names 

    shorten necb regression test result names
    @ckirney
    ckirney authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    58e41fd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1771 from NREL/master 

    Include stat file changes from master
    @ckirney
    ckirney authored Jun 19, 2024
    Configuration menu
    Copy the full SHA
    47ca28e View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Initialize chiller capacity so that chillers with names not including… 

    … 'primary' or 'secondary' have their capacity set
    @khaddad
    khaddad committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    8540f4b View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2024

  1. Add regression test cases for ECM HS14 for 'BTAP1980TO2010'

    @khaddad
    khaddad committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    b504fd0 View commit details
    Browse the repository at this point in the history

  2. Including path and regression test directory names to reduce path len… 

    …gths.
    @ckirney
    ckirney committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    9caf698 View commit details
    Browse the repository at this point in the history

  3. Including path and regression test directory names to reduce path len… 

    …gths.
    @ckirney
    ckirney committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    36b4210 View commit details
    Browse the repository at this point in the history

  4. Updating ci_tests.txt with new regression test path name

    @ckirney
    ckirney committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    78d2333 View commit details
    Browse the repository at this point in the history

  5. Updating regression test expected results path and regression test cr… 

    …eator template.
    @ckirney
    ckirney committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    ae59dda View commit details
    Browse the repository at this point in the history

  6. Updating regression test output message to use correct paths and file… 

    …names.
    @ckirney
    ckirney committed Jun 27, 2024
    Configuration menu
    Copy the full SHA
    510d6f2 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Including fixes for HS14_CGSHP_FanCoils with BTAPPRE1980 and BTAP1980… 

    …TO2010.
    @ckirney
    ckirney committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    e02cc31 View commit details
    Browse the repository at this point in the history

  2. Removing idf files from regression test results.

    @ckirney
    ckirney committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    ce44763 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1776 from NREL/master 

    Incorporating changes from master into nrcan branch.
    @ckirney
    ckirney authored Jul 8, 2024
    Configuration menu
    Copy the full SHA
    2d1b381 View commit details
    Browse the repository at this point in the history

  4. Including envelope ecm test and expected result file.

    @ckirney
    ckirney committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3826aea View commit details
    Browse the repository at this point in the history

  5. Including envelope ecm test in set of automatic tests run by NREL.

    @ckirney
    ckirney committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5fd239d View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. Adding existing building regression test expected results for HS14_CG… 

    …SHP_FanCoils test.
    @ckirney
    ckirney committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b2d0d53 View commit details
    Browse the repository at this point in the history

  2. Adding regression test and expected results for NoAir_Baseboard ECM.

    @ckirney
    ckirney committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    c66f8e9 View commit details
    Browse the repository at this point in the history

  3. Adding regression test and expected results for unitary cop ECM. Modi… 

    …fying parametric_test_creator.rb to handle the unitary cop tests.
    @ckirney
    ckirney committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    4df08b5 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Adding economizer, boiler efficiency, furnace efficiency, and SHW eff… 

    …iciency tests. Adding economizer expected results. Changing unitary cop test name.
    @ckirney
    ckirney committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a6e3cba View commit details
    Browse the repository at this point in the history

  2. Adding boiler expected results.

    @ckirney
    ckirney committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    24573c0 View commit details
    Browse the repository at this point in the history

  3. Adding furnace eff test expected results.

    @ckirney
    ckirney committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    0e69bb3 View commit details
    Browse the repository at this point in the history

  4. Adding shw eff test expected results. Renaming unitary cop test in, a… 

    …nd adding economizer, boiler efficiency, furnace efficiency, and SHW efficiency tests to, ci_test.txt list.
    @ckirney
    ckirney committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8a00a69 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2024

  1. Merge pull request #1778 from NREL/nrcan_merge_into_nrcan 

    Including changes from master into nrcan branch
    @ckirney
    ckirney authored Jul 18, 2024
    Configuration menu
    Copy the full SHA
    0e0eff8 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Add files via upload 

    Naming method for system names
    @khaddad
    khaddad authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ebf3175 View commit details
    Browse the repository at this point in the history

  2. Update hvac_systems.rb 

    Add system heat recovery to general syntax text used in system naming method
    @khaddad
    khaddad authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    ac67f14 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2024

  1. update syntax document for names for air systems

    @khaddad
    khaddad committed Aug 8, 2024
    Configuration menu
    Copy the full SHA
    bb42123 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Add boiler_fuel and boiler_cap_ratio arguments to model_apply_standar… 

    …d. This allows the fuel type of the boiler to be set and to use an electric boiler rather than resistance heaters everywhere. The boiler_cap_ratio argument will be used when the ability to customize the backup boiler fuel type and capacities are implemented.
    @ckirney
    ckirney committed Aug 21, 2024
    Configuration menu
    Copy the full SHA
    27254ea View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2024

  1. Update btap_datapoint.rb with new boiler parameters, update boiler_fu… 

    …el_type_sets.json with FuelOilNo2, remove forcing boiler to be electricity from necb_2011.rb.
    @ckirney
    ckirney committed Aug 22, 2024
    Configuration menu
    Copy the full SHA
    2b634bf View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

  1. All the conflicts with master are resolved now

    @navidshh
    navidshh committed Sep 5, 2024
    Configuration menu
    Copy the full SHA
    6cba07f View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2024

  1. swh fuel discripancy revised

    @navidshh
    navidshh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    8d3ac29 View commit details
    Browse the repository at this point in the history

  2. swh fuel revised

    @navidshh
    navidshh committed Sep 10, 2024
    Configuration menu
    Copy the full SHA
    9be7d46 View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. Including code to adjust the capacities of boilers with dissimilar fu… 

    …el types. Fixing boiler efficiency ECM so that efficiency changes are only applied to fuel fired boilers, not electrically heated boilers.
    @ckirney
    ckirney committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    7febc69 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. updated gemspec to deal with public_suffix requirement.

    Phylroy Lopez committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    723035b View commit details
    Browse the repository at this point in the history

  2. Errors with reading csv file for NIST infiltration tests.. Most likel… 

    …y due to a gem update. Explicitly using encoding
    Phylroy Lopez committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    cd379eb View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. added vscode documentation

    Phylroy Lopez committed Sep 17, 2024
    Configuration menu
    Copy the full SHA
    5b4423b View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Update vscode.md 

    updated docs
    @phylroy
    phylroy authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    982ad87 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1813 from NREL/master 

    Including further changes from master into nrcan code
    @ckirney
    ckirney authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    9b91377 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1814 from NREL/nrcan 

    Include updates from nrcan branch into merge branch
    @ckirney
    ckirney authored Sep 18, 2024
    Configuration menu
    Copy the full SHA
    caf77a4 View commit details
    Browse the repository at this point in the history

  4. Merging nrcan_436 into nrcan_master_merge branch. This includes the a… 

    …bility to define boilers of dissimilar fuel types and adjust their relative capacities.
    @ckirney
    ckirney committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b7b6832 View commit details
    Browse the repository at this point in the history

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

    …tap_cli test.
    @ckirney
    ckirney committed Sep 18, 2024
    Configuration menu
    Copy the full SHA
    b58610a View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

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

    …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.
    @ckirney
    ckirney committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8d25230 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

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

    … heaters use hot-water.
    @ckirney
    ckirney committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    fedbf23 View commit details
    Browse the repository at this point in the history

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

    …hods. Update the system tests to include the backup boiler fueltype.
    @ckirney
    ckirney committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    cf79430 View commit details
    Browse the repository at this point in the history

  3. Updating the 'setup_hw_loop_with_components' method calls in unit tes… 

    …ts to include additional backup boiler fueltype argument.
    @ckirney
    ckirney committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    de18932 View commit details
    Browse the repository at this point in the history

  4. Updating nrcan_master_merge branch with boiler changes from nrcan_436.

    @ckirney
    ckirney committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    db3b7fd View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. Adding backup boiler fueltype parameter for 'setup_hw_loop_with_compo… 

    …nents' method calls in some additional tests.
    @ckirney
    ckirney committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    7ab9da9 View commit details
    Browse the repository at this point in the history

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

    @ckirney
    ckirney committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d727490 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. Updating regression test expected results and report unit test expect… 

    …ed results.
    @ckirney
    ckirney committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    ef3711c View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Update vscode.md 

    typo in docker command
    @phylroy
    phylroy authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    40a89dd View commit details
    Browse the repository at this point in the history

  2. Update vscode.md 

    Added instructions for debugger
    @phylroy
    phylroy authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    702ab4e View commit details
    Browse the repository at this point in the history

  3. Update vscode.md 

    fixed typo.
    @phylroy
    phylroy authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    a24f693 View commit details
    Browse the repository at this point in the history

  4. Update vscode.md 

    Added tip on increasing terminal history.
    @phylroy
    phylroy authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    11197fa View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. Merge pull request #1817 from NREL/nrcan 

    Including updates from nrcan branch
    @ckirney
    ckirney authored Sep 26, 2024
    Configuration menu
    Copy the full SHA
    36d66cd View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. Merge branch 'master' into nrcan_master_merge

    @mdahlhausen
    mdahlhausen committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    aaa0f1e View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

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

    @ckirney
    ckirney committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    da6d6db View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Updating regression tests results to account for revisions to code.

    @ckirney
    ckirney committed Oct 17, 2024
    Configuration menu
    Copy the full SHA
    e8a0d2e View commit details
    Browse the repository at this point in the history