-
Notifications
You must be signed in to change notification settings - Fork 156
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
Issue2614 chilled beam sequences controls only #3411
Merged
mwetter
merged 41 commits into
lbl-srg:issue2614_ChilledBeamSequences
from
karthikeyad-pnnl:issue2614_ChilledBeamSequences_ControlsOnly
Nov 6, 2023
Merged
Issue2614 chilled beam sequences controls only #3411
mwetter
merged 41 commits into
lbl-srg:issue2614_ChilledBeamSequences
from
karthikeyad-pnnl:issue2614_ChilledBeamSequences_ControlsOnly
Nov 6, 2023
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Issue2614 chilled beam sequences
…re differential measurement
…ences_ControlsOnly Issue2614 chilled beam sequences controls only
Merging master branch from LBL
Set the min attributes of nPum and nVal to 1 instead of constant parameters
Removed the default values for chiWatStaPreMax and chiWatStaPreMin as these are design values
Errors from nexLagPum and lasLagPum blocks
Update branch by merging upstream master
…001/modelica-buildings into junkewang001-issue2614_ChilledBeamSequences
…2614_ChilledBeamSequences_ControlsOnly
…ntrol. Updated missing class names.
@karthikeyad-pnnl Would you please address the conflicts and also check why there is 3089 changed files? It may be necessary to close this PR and open a new PR? |
…odelica-buildings into lbl-srg-issue2614_ChilledBeamSequences
…ChilledBeamSequences_ControlsOnly
…com:karthikeyad-pnnl/modelica-buildings into issue2614_ChilledBeamSequences_ControlsOnly
@JayHuLBL I merged the branch from the lbl-repo, which seems to have resolved the merge conflicts. I don't see any unnecessary file changes. Please review the PR when you get a chance. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@mwetter I am submitting this PR to address the latest comments on #2614. Please review it when you get a chance. Thanks!