-
Notifications
You must be signed in to change notification settings - Fork 396
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 Meter:Custom with mix of valid and invalid names #10773
Conversation
@@ -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. |
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.
Seriously, clang-format is not worth it if this is the result.
@@ -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; |
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.
One line fix. A missing component variable/meter no longer sets an error condition that prevents the custom meter from being created.
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.
Looks good to me!
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, you've already fixed one of my bugs. You shouldn't have to fix all of them. |
@@ -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; |
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.
Looks good to me!
Test fine with latest develop pulled in, going in. Thanks @amirroth |
PR #10384 changed the behavior of
Meter:Custom
so that meter creation fails if one of the component variables or meters is missing. According to issue #10771, the desired behavior is to create the custom meter but ignore the missing component variable or meter. This behavior was restored.