-
Notifications
You must be signed in to change notification settings - Fork 425
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
Separate Infiltration from Natural Ventilation Flows for AirflowNetwork #8689
Merged
mjwitte
merged 17 commits into
develop
from
8475-Separate-AFN-infiltration-from-natural-ventilation
Apr 15, 2021
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
af69ecb
Upload a fix
lgu1234 3f8dcdd
Merge branch 'develop' into 8475-Separate-AFN-infiltration-from-natur…
lgu1234 8689baa
Solve merge conflict
lgu1234 73ab5d1
Merge remote-tracking branch 'remotes/origin/develop' into 8475-Separ…
mjwitte eadca0f
OA Details - separate AFN infil and vent
mjwitte e264b7a
Address comments
lgu1234 a1ed191
OA Details - fix AFN infil and vent
mjwitte d4d6f3e
Merge remote-tracking branch 'remotes/origin/develop' into 8475-Separ…
mjwitte ef7cf5f
Merge branch '8475-Separate-AFN-infiltration-from-natural-ventilation…
mjwitte b693d92
Separate AFN infiltration and ventilation - attempt to save a few cycles
mjwitte bb5cacd
OA Details - some cleanup
mjwitte 4d33cfa
Merge remote-tracking branch 'remotes/origin/develop' into 8475-Separ…
mjwitte b979ed6
Separate AFN infiltration and ventilation - add AFN vent output varia…
mjwitte e1b6ea0
Fix formatting
mjwitte 18b4bd0
More formatting
mjwitte 9871588
Merge remote-tracking branch 'remotes/origin/develop' into 8475-Separ…
mjwitte 57948ab
Merge remote-tracking branch 'remotes/origin/develop' into 8475-Separ…
mjwitte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1493,6 +1493,8 @@ namespace AirflowNetwork { | |
Real64 TotalLat; | ||
Real64 SumMCp; | ||
Real64 SumMCpT; | ||
Real64 SumMVCp; | ||
Real64 SumMVCpT; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add 2 more variables to store ventilation values. |
||
Real64 SumMHr; | ||
Real64 SumMHrW; | ||
Real64 SumMMCp; | ||
|
@@ -1509,8 +1511,8 @@ namespace AirflowNetwork { | |
// Default Constructor | ||
AirflowNetworkExchangeProp() | ||
: MultiZoneSen(0.0), MultiZoneLat(0.0), LeakSen(0.0), LeakLat(0.0), CondSen(0.0), DiffLat(0.0), RadGain(0.0), TotalSen(0.0), | ||
TotalLat(0.0), SumMCp(0.0), SumMCpT(0.0), SumMHr(0.0), SumMHrW(0.0), SumMMCp(0.0), SumMMCpT(0.0), SumMMHr(0.0), SumMMHrW(0.0), | ||
SumMHrCO(0.0), SumMMHrCO(0.0), TotalCO2(0.0), SumMHrGC(0.0), SumMMHrGC(0.0), TotalGC(0.0) | ||
TotalLat(0.0), SumMCp(0.0), SumMCpT(0.0), SumMVCp(0.0), SumMVCpT(0.0), SumMHr(0.0), SumMHrW(0.0), SumMMCp(0.0), SumMMCpT(0.0), | ||
SumMMHr(0.0), SumMMHrW(0.0), SumMHrCO(0.0), SumMMHrCO(0.0), TotalCO2(0.0), SumMHrGC(0.0), SumMMHrGC(0.0), TotalGC(0.0) | ||
{ | ||
} | ||
}; | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add 3 new output variables for natural ventilation flows