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.

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

Including changes to use OS 3.5.1 and changes in master #1468

Merged
merged 99 commits into from
Mar 24, 2023

Commits on Mar 31, 2022

  1. Configuration menu
    Copy the full SHA
    d151882 View commit details
    Browse the repository at this point in the history
  2. minor edit-supermarket.json

    ybae0330 committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    43beab1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    73f5dd9 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f4f48ca View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2022

  1. Update cases and walkins

    ybae0330 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    0a0c2f2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d7c766 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    10d006f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3968ad3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f841c63 View commit details
    Browse the repository at this point in the history
  6. case name type fixed

    ybae0330 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    9c4a95f View commit details
    Browse the repository at this point in the history
  7. minor error fixed-walkins

    ybae0330 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    27bda75 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    0162870 View commit details
    Browse the repository at this point in the history
  9. error fixed-defrost type

    ybae0330 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    4d6854f View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    c086712 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    85041be View commit details
    Browse the repository at this point in the history
  12. compressor update

    ybae0330 committed Apr 6, 2022
    Configuration menu
    Copy the full SHA
    1dbee38 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2022

  1. Configuration menu
    Copy the full SHA
    032423e View commit details
    Browse the repository at this point in the history
  2. typo fixed

    ybae0330 committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    fa4acc7 View commit details
    Browse the repository at this point in the history
  3. Update test_supermarket.rb

    ybae0330 committed Apr 13, 2022
    Configuration menu
    Copy the full SHA
    43efad2 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2022

  1. remove existing daylighting controls

    remove existing daylighting controls by default for prototype and prm workflow methods
    mdahlhausen committed Apr 15, 2022
    Configuration menu
    Copy the full SHA
    d7cd65f View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2022

  1. Configuration menu
    Copy the full SHA
    914f10f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    98c9357 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2023

  1. Use replace the 'setMinimumSystemAirFlowRatio' with 'setCentralHeatin…

    …gMaximumSystemAirFlowRatio' when using OS version 2.7.0 and later. Apparently, this was being done behind the scenes anyway but NREL decided to remove the 'setMinimumSystemAirFlowRatio' entirely by OS 3.5.1.
    ckirney committed Jan 26, 2023
    Configuration menu
    Copy the full SHA
    764678a View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2023

  1. Configuration menu
    Copy the full SHA
    73e4395 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f4912cf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    cee6f6c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    1e5feaf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c142acf View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2023

  1. fix issue 1326

    mdahlhausen committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    cad33a2 View commit details
    Browse the repository at this point in the history
  2. add default chiller efficiency

    use 90.1-2019 value for 150 ton chiller by cooling type
    mdahlhausen committed Feb 24, 2023
    Configuration menu
    Copy the full SHA
    b14d455 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4fbd496 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2023

  1. Configuration menu
    Copy the full SHA
    0dc5df7 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2023

  1. Configuration menu
    Copy the full SHA
    246abcd View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2023

  1. Configuration menu
    Copy the full SHA
    d119804 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2023

  1. Configuration menu
    Copy the full SHA
    ebeddea View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    917f430 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2023

  1. Incorporating changes for OS version 3.5.1.

    Chris Kirney committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    872bc63 View commit details
    Browse the repository at this point in the history
  2. Modified the NV ECM and expected results of unit tests for NV and DCV…

    … ECMs due to OpenStudio v3.5.1; Updated bundler version in openstudio-standards.gemspec
    srgilani committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    73c11e9 View commit details
    Browse the repository at this point in the history
  3. update to address comments

    weilixu committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    8f2c01d View commit details
    Browse the repository at this point in the history
  4. Updated unit test for the DCV ECM and its expected results file with …

    …LargeOffice instead of Hospital
    srgilani committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    e68a76e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b1a4042 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a862617 View commit details
    Browse the repository at this point in the history
  7. Update simulation.rb

    close the sql file if open in addition to resetting the sql file
    mdahlhausen committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    3fdc061 View commit details
    Browse the repository at this point in the history
  8. update regression tests

    mdahlhausen committed Mar 9, 2023
    Configuration menu
    Copy the full SHA
    9efd7bf View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    d968d51 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2023

  1. Update the number of iteration to 3,

    Remove the optmum start control from PRM method
    weilixu committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9c4a299 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'appendixG_dev_debug_unmet_load_hour_issues' of https://…

    …github.com/NREL/openstudio-standards into appendixG_dev_debug_unmet_load_hour_issues
    
    # Conflicts:
    #	lib/openstudio-standards/standards/Standards.Model.rb
    weilixu committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    156f633 View commit details
    Browse the repository at this point in the history
  3. fix adding the syntax

    weilixu committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    b903048 View commit details
    Browse the repository at this point in the history
  4. Removing old btap routines from standards project. (#1432)

    * removed redundant tests.. now always rely on circle_ci.txt for what tests to run. and only rake test:parallel_run_all_tests_locally
    
    * commented out what I think is unused code.
    
    * readded btap_results
    phylroy authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    a794506 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1429 from NREL/nrcan_os351_sg

    nrcan_os351_sg: Modified NV and DCV
    ckirney authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    872a8f8 View commit details
    Browse the repository at this point in the history
  6. Updating FullServiceRestaurant NECB2020 Electricity regression test r…

    …esults.
    Chris Kirney committed Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9e6d113 View commit details
    Browse the repository at this point in the history
  7. Merge pull request #1428 from NREL/appendixG_dev_debug_unmet_load_hou…

    …r_issues
    
    Appendix g dev debug unmet load hour issues
    mdahlhausen authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    807bd6b View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    36c2db6 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    32dfbb8 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1433 from NREL/master

    Include additional changes from master branch
    ckirney authored Mar 10, 2023
    Configuration menu
    Copy the full SHA
    9d7e134 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    277278d View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    d0368b9 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    5e1be41 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2023

  1. Configuration menu
    Copy the full SHA
    24e2830 View commit details
    Browse the repository at this point in the history
  2. reset thermal zone daylighting fraction

    reset the thermal zone daylighting secondary/primary daylighting fraction if setting the primary/secondary fraction would result in a value greater than 1.
    
    also add a test for daylighting controls
    mdahlhausen committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    58136c3 View commit details
    Browse the repository at this point in the history
  3. fix ems syntax and remove methods

    several changes to applicability and ems syntax
    mdahlhausen committed Mar 11, 2023
    Configuration menu
    Copy the full SHA
    e602414 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c50e1bd View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1303 from NREL/fix/issue274

    remove existing daylighting controls
    mdahlhausen authored Mar 11, 2023
    Configuration menu
    Copy the full SHA
    9dd7a52 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a0d267e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    14b3310 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    15d1178 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1299 from NREL/SupermarketUpdate

    Supermarket update
    mdahlhausen authored Mar 11, 2023
    Configuration menu
    Copy the full SHA
    29c3c80 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1422 from NREL/fix/issue1417

    add default chiller efficiency
    mdahlhausen authored Mar 11, 2023
    Configuration menu
    Copy the full SHA
    50d4bcb View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2023

  1. fix type and delete extra methods

    change methods to use find_and_set_insulation_layer instead of find_and_set_insulaton_layer (misspelled), and delete all instances  of find_and_set_insulaton_layer (misspelled)
    mdahlhausen committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    2a108e3 View commit details
    Browse the repository at this point in the history
  2. change prm boiler naming

    - Fix #230
    - Update to PRM method to have better naming for boilers
    - Re-apply efficiency standard because multiple boilers with lower capacity may have different efficiency standards at the smaller size
    mdahlhausen committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    0343bf6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    894fd3e View commit details
    Browse the repository at this point in the history
  4. Revert "fix type and delete extra methods"

    This reverts commit 2a108e3.
    mdahlhausen committed Mar 12, 2023
    Configuration menu
    Copy the full SHA
    e1d05c5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b2a7ed1 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2023

  1. Configuration menu
    Copy the full SHA
    0cb39cc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    82fdb4a View commit details
    Browse the repository at this point in the history
  3. fixes to hpwh

    - set fan flow rate based on capacity, not a fixed value per #684
    - check schedule object type for HPWH swh sch EMS actuator
    - add tests
    mdahlhausen committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    5ddfa5e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1435 from NREL/fix/issue1423

    fix typo and delete extra methods
    mdahlhausen authored Mar 13, 2023
    Configuration menu
    Copy the full SHA
    c5fbf4e View commit details
    Browse the repository at this point in the history
  5. remove boiler sizing calls

    applying the boiler efficiency will rename it later
    mdahlhausen committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    21deece View commit details
    Browse the repository at this point in the history
  6. support OS_HeatExchanger_FluidToFluid in fuels

    Add check for plant loop cooling fuels for 'OS_HeatExchanger_FluidToFluid' objects.  Fixes issue #754
    mdahlhausen committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    b21fd9d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0f587ad View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2023

  1. Merge pull request #1436 from NREL/fix/issue230

    change prm boiler naming
    mdahlhausen authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    bc91762 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1437 from NREL/fix/issue754

    support OS_HeatExchanger_FluidToFluid in fuels
    mdahlhausen authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    d1cde87 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1420 from NREL/adding-hpwh-ems-schedule-override

    adding hpwh ems schedule override
    mdahlhausen authored Mar 14, 2023
    Configuration menu
    Copy the full SHA
    3ffc33d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    551d5ab View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b949caa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5ed23de View commit details
    Browse the repository at this point in the history
  7. Revert "Update simulation.rb"

    This reverts commit 3fdc061.
    mdahlhausen committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    4170d6f View commit details
    Browse the repository at this point in the history
  8. break out lights in EMS code

    - clone and assign individual lights objects to each space
    - use the space object in E+9.6 / OS v3.3 and higher versions
    - hardcode space floor area as a number instead of an internal variable (will need to delete and re-run method if space sizes change)
    mdahlhausen committed Mar 14, 2023
    Configuration menu
    Copy the full SHA
    270099e View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2023

  1. Merge pull request #1430 from NREL/fix/sql_file_close

    Update simulation.rb
    mdahlhausen authored Mar 15, 2023
    Configuration menu
    Copy the full SHA
    016e0c3 View commit details
    Browse the repository at this point in the history
  2. remove space type lights

    after cloning the space type lights to the individual spaces, delete the lights on the space type objects.
    
    Fixes the issue of having duplicate lights
    mdahlhausen committed Mar 15, 2023
    Configuration menu
    Copy the full SHA
    4b2442e View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2023

  1. update regression models

    update 90.1-2016 and 90.1-2019 regression models
    mdahlhausen committed Mar 16, 2023
    Configuration menu
    Copy the full SHA
    b5638a5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e678573 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1458 from NREL/nrcan_os351_merge

    NRCan merge using OS351
    mdahlhausen authored Mar 16, 2023
    Configuration menu
    Copy the full SHA
    8a0a580 View commit details
    Browse the repository at this point in the history
  4. Merge pull request #1447 from NREL/fix/issue1446

    break out lights in EMS code
    mdahlhausen authored Mar 16, 2023
    Configuration menu
    Copy the full SHA
    7c4dc79 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Update version.rb

    mdahlhausen committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    f1c7246 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Configuration menu
    Copy the full SHA
    30ae6af View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2023

  1. Configuration menu
    Copy the full SHA
    6c6c3bc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6038645 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1463 from NREL/nrcan_warehouse

    Correcting Warehouse wall orientation
    ckirney authored Mar 23, 2023
    Configuration menu
    Copy the full SHA
    3983d5a View commit details
    Browse the repository at this point in the history