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

Include additional changes from master branch #1433

Merged
merged 10 commits into from
Mar 10, 2023
Merged

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. Configuration menu
    Copy the full SHA
    4fbd496 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

Commits on Mar 9, 2023

  1. 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
  2. Configuration menu
    Copy the full SHA
    a862617 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. 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