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

Address issues due to Output:Variable regex #6019

Merged
merged 3 commits into from Feb 19, 2017
Merged

Conversation

mbadams5
Copy link
Contributor

Pull request overview

This fixes the linux build issue since RE2 doesn't build with -fPIC apparently.

This also addresses the cppcheck warnings.

I also found and fixed a logic issue that was preventing the Output:Variables with regular expressions from outputting in the ESO file.

Work Checklist

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)
  • At least one of the following appropriate labels must be added to this PR to be consumed into the changelog:
    • Defect: This pull request repairs a github defect issue. The github issue should be referenced in the PR description
    • Refactoring: This pull request includes code changes that don't change the functionality of the program, just perform refactoring
    • NewFeature: This pull request includes code to add a new feature to EnergyPlus
    • Performance: This pull request includes code changes that are directed at improving the runtime performance of EnergyPlus
    • DoNoPublish: This pull request includes changes that shouldn't be included in the changelog

Review Checklist

This will not be exhaustively relevant to every PR.

  • Code style (parentheses padding, variable names)
  • Functional code review (it has to work!)
  • If defect, results of running current develop vs this branch should exhibit the fix
  • CI status: all green or justified
  • Performance: CI Linux results include performance check -- verify this
  • Unit Test(s)
  • C++ checks:
    • Argument types
    • If any virtual classes, ensure virtual destructor included, other things
  • IDD changes:
    • Verify naming conventions and styles, memos and notes and defaults
    • Open windows IDF Editor with modified IDD to check for errors
    • If transition, add rules to spreadsheet
    • If transition, add transition source
    • If transition, update idfs
  • If new idf included, locally check the err file and other outputs
  • Documentation changes in place
  • Changed docs build successfully
  • ExpandObjects changes?
  • If output changes, including tabular output structure, add to output rules file for interfaces

@mbadams5 mbadams5 added the DoNotPublish Includes changes that shouldn't be reported in the changelog label Feb 17, 2017
@mbadams5 mbadams5 added this to the EnergyPlus 8.7.0 milestone Feb 17, 2017
@mbadams5
Copy link
Contributor Author

This corrects issues with #6017

@Myoldmopar
Copy link
Member

Thanks for taking this on. I don't think the two failures have anything to do with this. Do you want to wait until Windows? Or can i merge this to start cleaning the dashboard back up?

@mbadams5
Copy link
Contributor Author

I don't know what caused those regression failures since they are in the python scripts.

It is up to you whether to wait for windows or not. Looking at other branches that have been merged into develop or develop merged into them, it seems like the windows CIs are clean in develop. It looks like this only affects Linux.

@Myoldmopar Myoldmopar merged commit 4af3c67 into develop Feb 19, 2017
@Myoldmopar Myoldmopar deleted the output_variable_regex branch February 19, 2017 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DoNotPublish Includes changes that shouldn't be reported in the changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants