Skip to content

Commit

Permalink
Merge pull request #10773 from NREL/CustomMeterFix
Browse files Browse the repository at this point in the history
Fix Meter:Custom with mix of valid and invalid names
  • Loading branch information
Myoldmopar authored Sep 30, 2024
2 parents 76fb9f8 + 93b50a9 commit b422061
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/EnergyPlus/OutputProcessor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -803,7 +803,7 @@ namespace OutputProcessor {

// Has to be a summed variable
if (srcDDVar->storeType != StoreType::Sum) {
ShowWarningCustomMessage(state,
ShowWarningCustomMessage(state, // Is clang-format formatting things like this? This is gross.
eoh,
format(R"(Meter:Custom="{}", variable not summed variable {}="{}".)",
ipsc->cAlphaArgs(1),
Expand Down Expand Up @@ -867,8 +867,7 @@ namespace OutputProcessor {
ipsc->cAlphaFieldNames(fldIndex + 1),
ipsc->cAlphaArgs(fldIndex + 1)));
ShowContinueError(state, "...will not be shown with the Meter results.");
foundBadSrc = true;
break;
// Not setting the foundBadSrc flag here.
}

} // for (fldIndex)
Expand Down

4 comments on commit b422061

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4: OK (2914 of 2914 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - Win64-Windows-10-VisualStudio-16: OK (2892 of 2892 tests passed, 0 test warnings)

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-UnitTestsCoverage-RelWithDebInfo: OK (2098 of 2098 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

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

develop (Myoldmopar) - x86_64-Linux-Ubuntu-22.04-gcc-11.4-IntegrationCoverage-RelWithDebInfo: OK (799 of 799 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.