-
Notifications
You must be signed in to change notification settings - Fork 390
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
Fix Thermal Comfort zone temperature and humidity lag #8572
Merged
Myoldmopar
merged 16 commits into
NREL:develop
from
jcyuan2020:Thermal_Comfort_Temperature_Fix
Mar 21, 2021
Merged
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
56036e9
Thermal comfort calc air temeprature update correction. Compiles ok.
jcyuan2020 cf570ee
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 af70151
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 a16aed5
Unit test development.
jcyuan2020 36f7229
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 c784193
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 2e4c43e
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 0a539f5
2021-03-05: Resolve merge conflicts brought by dataHeatBalFanSys stat…
jcyuan2020 827220f
Revise unit test to accomonadate state variable change.
jcyuan2020 6cb4b32
Add additional changes to solve temp and humid synchronization.
jcyuan2020 e561423
Update unit test for synchronization code revisions.
jcyuan2020 db8285f
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 6985e48
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 434adb3
Remove redudant commented code lines.
jcyuan2020 3a1df8e
Merge remote-tracking branch 'upstream/develop' into Thermal_Comfort_…
jcyuan2020 b20eb5c
2021-03-19 Resolved conflicts when merging upstream develop. Took cha…
jcyuan2020 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -243,8 +243,8 @@ namespace EnergyPlus::HVACManager { | |
|
||
state.dataHeatBalFanSys->ZT = state.dataHeatBalFanSys->MAT; | ||
// save for use with thermal comfort control models (Fang, Pierce, and KSU) | ||
state.dataHeatBalFanSys->ZTAVComf = state.dataHeatBalFanSys->ZTAV; | ||
state.dataHeatBalFanSys->ZoneAirHumRatAvgComf = state.dataHeatBalFanSys->ZoneAirHumRatAvg; | ||
// state.dataHeatBalFanSys->ZTAVComf = state.dataHeatBalFanSys->ZTAV; | ||
// state.dataHeatBalFanSys->ZoneAirHumRatAvgComf = state.dataHeatBalFanSys->ZoneAirHumRatAvg; | ||
state.dataHeatBalFanSys->ZTAV = 0.0; | ||
state.dataHeatBalFanSys->ZoneThermostatSetPointHiAver = 0.0; | ||
state.dataHeatBalFanSys->ZoneThermostatSetPointLoAver = 0.0; | ||
|
@@ -530,6 +530,9 @@ namespace EnergyPlus::HVACManager { | |
FirstTimeStepSysFlag = false; | ||
} // system time step loop (loops once if no downstepping) | ||
|
||
state.dataHeatBalFanSys->ZTAVComf = state.dataHeatBalFanSys->ZTAV; | ||
state.dataHeatBalFanSys->ZoneAirHumRatAvgComf = state.dataHeatBalFanSys->ZoneAirHumRatAvg; | ||
|
||
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. A small change to make such an impact. But it seems reasonable, and analysis of the diffs shows better results. This is fine. |
||
ManageZoneAirUpdates(state, iPushZoneTimestepHistories, ZoneTempChange, ShortenTimeStepSys, UseZoneTimeStepHistory, PriorTimeStep); | ||
if (state.dataContaminantBalance->Contaminant.SimulateContaminants) | ||
ManageZoneContaminanUpdates(state, iPushZoneTimestepHistories, ShortenTimeStepSys, UseZoneTimeStepHistory, PriorTimeStep); | ||
|
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.
@jcyuan2020 These lines should be deleted instead of commented, but otherwise, I'm good with this.
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.
@mjwitte The redundant commented code lines are now removed.