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.

Sign up for GitHub

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

Jump to bottom

Fix #8614 that hybrid unitary HVAC equipment cannot be found #8709

Merged
merged 3 commits into from
Apr 30, 2021
Merged

Fix #8614 that hybrid unitary HVAC equipment cannot be found #8709

merged 3 commits into from
Apr 30, 2021

Conversation

LipingWang
Copy link
Contributor

@LipingWang LipingWang commented Apr 10, 2021 •
edited by mjwitte
Loading

Pull request overview

Pull Request Author

Add to this list or remove from it as applicable. This is a simple templated set of guidelines.

  • Title of PR should be user-synopsis style (clearly understandable in a standalone changelog context)
  • Label the PR with at least one of: Defect, Refactoring, NewFeature, Performance, and/or DoNoPublish
  • Pull requests that impact EnergyPlus code must also include unit tests to cover enhancement or defect repair
  • Author should provide a "walkthrough" of relevant code changes using a GitHub code review comment process
  • If any diffs are expected, author must demonstrate they are justified using plots and descriptions
  • If changes fix a defect, the fix should be demonstrated in plots and descriptions
  • If any defect files are updated to a more recent version, upload new versions here or on DevSupport
  • If IDD requires transition, transition source, rules, ExpandObjects, and IDFs must be updated, and add IDDChange label
  • If structural output changes, add to output rules file and add OutputChange label
  • If adding/removing any LaTeX docs or figures, update that document's CMakeLists file dependencies

Reviewer

This will not be exhaustively relevant to every PR.

  • Perform a Code Review on GitHub
  • If branch is behind develop, merge develop and build locally to check for side effects of the merge
  • If defect, verify by running develop branch and reproducing defect, then running PR and reproducing fix
  • If feature, test running new feature, try creative ways to break it
  • CI status: all green or justified
  • Check that performance is not impacted (CI Linux results include performance check)
  • Run Unit Test(s) locally
  • Check any new function arguments for performance impacts
  • Verify IDF naming conventions and styles, memos and notes and defaults
  • If new idf included, locally check the err file and other outputs

@Myoldmopar Myoldmopar added the Defect Includes code to repair a defect in EnergyPlus label Apr 30, 2021
Myoldmopar
Myoldmopar approved these changes Apr 30, 2021
View reviewed changes
idd/Energy+.idd.in
@@ -35433,7 +35433,6 @@ ZoneHVAC:HybridUnitaryHVAC,
A1, \field Name
\required-field
\type alpha
\retaincase
Copy link
Member

Choose a reason for hiding this comment

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

Yeah I think this is good, I don't know why it was retaincase before. There shouldn't be anything case specific.

src/EnergyPlus/HybridUnitaryAirConditioners.cc
@@ -99,7 +99,7 @@ void SimZoneHybridUnitaryAirConditioners(EnergyPlusData &state,
if (CompIndex == 0) {
CompNum = UtilityRoutines::FindItemInList(CompName, state.dataHybridUnitaryAC->ZoneHybridUnitaryAirConditioner);
if (CompNum == 0) {
ShowFatalError(state, "SimZoneHybridUnitaryAirConditioners: Zone evaporative cooler unit not found.");
ShowFatalError(state, "SimZoneHybridUnitaryAirConditioners: ZoneHVAC:HybridUnitaryHVAC not found.");
Copy link
Member

Choose a reason for hiding this comment

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

Yeah that's better. 👍

tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc
@@ -515,18 +515,18 @@ TEST_F(EnergyPlusFixture, Test_UnitaryHybridAirConditioner_ValidateFieldsParsing
{
std::string idf_objects = delimited_string({
"ZoneHVAC:HybridUnitaryHVAC,",
"MUNTERSEPX5000, !- Name",
"Hybrid Unit 1, !- Name",
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if this change is actually tested in the unit test, is it? I'm OK with this simple IDD change anyway. @mjwitte is there something I'm missing that this shouldn't go right in?

Copy link
Contributor

Choose a reason for hiding this comment

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

Nope, nothing more to see here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is related to the 'retaincase.' Previously, only object names in uppercase letters for ZoneHVAC:HybridUnitaryHVAC can be correctly recognized. With the change, the object name in mixed uppercase and lowercase letters can be correctly recognized using an existing unit test. It seems that additional lines are not showing here. Please refer to lines 579-603 for adding another object of ZoneHVAC:HybridUnitaryHVAC. In addition, a few checking function calls were added (lines 647-652) of this unit test.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah, it's fine.

@Myoldmopar
Copy link
Member

I pulled up to latest develop just to make sure the unit test still built and it does fine. And everything runs both serially and in parallel. Good to go in. Thanks @LipingWang

@Myoldmopar Myoldmopar merged commit 16fdce2 into NREL:develop Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Myoldmopar Myoldmopar Myoldmopar approved these changes

@mjwitte mjwitte mjwitte left review comments

Assignees
No one assigned
Labels
Defect Includes code to repair a defect in EnergyPlus
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Hybrid Unitary HVAC equipment cannot be found
6 participants
@LipingWang @Myoldmopar @mjwitte @nrel-bot @nrel-bot-2 @nrel-bot-3