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

Prepare for Restarting Models With Segment Level UDQs #4224

Merged
merged 1 commit into from
Oct 2, 2024

Conversation

bska
Copy link
Member

@bska bska commented Sep 23, 2024

In particular

  • Explicitly include some headers that will not be available through transitive inclusion
  • Remove some unneeded objects/helper functions
  • Move helper functions into anonymous namespaces where appropriate
  • Re-sort #include statements

@bska
Copy link
Member Author

bska commented Sep 23, 2024

jenkins build this please

@bska bska force-pushed the prepare-su-restart branch 8 times, most recently from cb6293f to 0ad2a83 Compare October 1, 2024 07:24
@bska
Copy link
Member Author

bska commented Oct 1, 2024

jenkins build this please

@bska bska force-pushed the prepare-su-restart branch 2 times, most recently from 69f33d3 to 1d9c11f Compare October 1, 2024 11:53
In particular

  - Explicitly include some headers that will not be available
    through transitive inclusion
  - Remove some unneeded objects/helper functions
  - Move helper functions into anonymous namespaces where
    appropriate
  - Re-sort #include statements
Copy link
Member

@atgeirr atgeirr left a comment

Choose a reason for hiding this comment

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

Can be merged when green.

// as a general purpose implementation, but does its job for testing and
// pretty-pringing for debugging purposes.

std::ostream& operator<<( std::ostream& stream, const Rates& r ) {
Copy link
Member

Choose a reason for hiding this comment

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

These operators might be good to have somewhere for debugging, but I guess they are not used here. A little surprised though, I would think some tests would print objects like these upon failure?

Copy link
Member Author

Choose a reason for hiding this comment

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

These operators might be good to have somewhere for debugging,

Maybe, but then they must be significantly amended to account for a lot of changes that have happened since they were introduced in commit b43461c (originally OPM/opm-output@084a233, PR OPM/opm-output#98) and never maintained.

I guess they are not used here.

Correct, they are not.

A little surprised though, I would think some tests would print objects like these upon failure?

That depends on how we write the test statements. Macros like BOOST_CHECK_EQUAL or BOOST_CHECK_LT require objects that can be converted to a character representation through operator<<(), but the more low-level test macros like BOOST_CHECK don't impost such requirements.

@atgeirr
Copy link
Member

atgeirr commented Oct 1, 2024

jenkins build this please

@bska
Copy link
Member Author

bska commented Oct 2, 2024

PR approved and build check is green. I'll merge into master.

@bska bska merged commit 10466e9 into OPM:master Oct 2, 2024
1 check passed
@bska bska deleted the prepare-su-restart branch October 2, 2024 07:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants