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

Change test tank height for heaters in stratified water heater #5881

Merged
merged 2 commits into from Sep 24, 2016

Conversation

Myoldmopar
Copy link
Member

This just changes which height to use in checking whether the heaters are out of range. I didn't do a deep inspection of the whole module, but the defect file now runs to completion with a clean error file, so I think this is good to go. Fixes: #5635

@Myoldmopar Myoldmopar added the Defect Includes code to repair a defect in EnergyPlus label Sep 23, 2016
@Myoldmopar Myoldmopar added this to the EnergyPlus 8.6.0 milestone Sep 23, 2016
@Myoldmopar
Copy link
Member Author

@mjwitte I put you down to review, but if you are out of time, I can handle it. The defect file from the issue now runs successfully though.

@JasonGlazer
Copy link
Contributor

JasonGlazer commented Sep 23, 2016

@Myoldmopar When running the unit tests locally, EnergyPlusFixture.HPWHWrappedDummyNodeConfig fails as well as EnergyPlusFixture.StratifiedTankUseEnergy

@Myoldmopar
Copy link
Member Author

Yeah, I saw the failures come through, I'll take a look in a bit. Can you post the failure output?

@JasonGlazer
Copy link
Contributor

[ RUN ] EnergyPlusFixture.HPWHEnergyBalance
........\tst\EnergyPlus\unit\WaterThermalTanks.unit.cc(734): error: Value of: WaterThermalTanks::GetWaterThermalTankInput()
Actual: true
Expected: false
[ FAILED ] EnergyPlusFixture.HPWHEnergyBalance (13131 ms)

[ RUN ] EnergyPlusFixture.StratifiedTankUseEnergy
........\tst\EnergyPlus\unit\WaterThermalTanks.unit.cc(1592): error: Value of: WaterThermalTanks::GetWaterThermalTankInputData( ErrorsFound )
Actual: true
Expected: false
[ FAILED ] EnergyPlusFixture.StratifiedTankUseEnergy (8177 ms)

@@ -2921,7 +2921,8 @@ namespace WaterThermalTanks {
WaterThermalTank( WaterThermalTankNum ).HeaterHeight1 = rNumericArgs( 7 );

//Test if Heater height is within range
if ( ( !WaterThermalTank( WaterThermalTankNum ).HeightWasAutoSized ) && ( WaterThermalTank( WaterThermalTankNum ).HeaterHeight1 > WaterThermalTank( WaterThermalTankNum ).Height ) ) {
Real64 tankHeightForTesting = 2.0 * sqrt( ( WaterThermalTank( WaterThermalTankNum ).Volume / WaterThermalTank( WaterThermalTankNum ).Height ) / DataGlobals::Pi );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Myoldmopar @JasonGlazer I think tankHeightForTesting needs to be sensitive to the Tank Shape type.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That makes all the sense. #dumb

I'll make that change shortly.

@JasonGlazer
Copy link
Contributor

Also, the code seems to be assuming a horizontal cylinder but looks like it would run for a vertical or horizontal orientation.

@Myoldmopar
Copy link
Member Author

I think 222ee92 should take care of this now. Unless I'm missing something from @JasonGlazer 's last comment.

@mjwitte
Copy link
Contributor

mjwitte commented Sep 23, 2016

@Myoldmopar Code changes look correct to me. I don't have time to test at the moment, but can tomorrow.

@Myoldmopar Myoldmopar merged commit fc5b8c5 into develop Sep 24, 2016
@Myoldmopar Myoldmopar deleted the 129956735-WaterHeaterHeight branch September 24, 2016 13:20
@JasonGlazer
Copy link
Contributor

@Myoldmopar and @mjwitte the code change looks good to me too and the CI tests are clean.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants