Varnish WELSPECS Report Implementation #4530
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'm creating this PR in draft mode because it depends on, and contains, the earlier PR #4526. I will keep the PR in a draft state until such time as it is ready for review and merging. |
bska
force-pushed
the
varnish-welspecs-report-impl
branch
8 times, most recently
from
e79ea68 to
0dd194c
Compare
The "integer control" format support in RPTSCHED influenced only the restart-like processing in RSTConfig and had no counterpart in the RPTConfig class. This commit corrects this omission and restores PRT file report generation for the older style RPTSCHED keyword. As an example, the NORNE_ATW2013 example model now gets injection, production, cumulative and WELSPECS reports whereas this was missing before. We don't expect that there are many new cases using this format, but this commit does at ensure that we don't remove useful reports for some existing simulation models. To this end, extract the restart-like integer control handling to a new helper class, RPTKeywordNormalisation, which consumes both mnemonics and integer controls and generates a map<string,int> of strictly mnemonic-like values. This class uses a callback function to process integer controls and we extract the RPTSCHED format handling to another pair of helper components - SimpleRPTIntegerControls - RptschedKeywordNormalisation The former is constructed from an ordered list of mnemonic strings and assigns the mnemonic map given a vector of integer control values. The latter uses the RPTKeywordNormalisation and an instance of the SimpleRPTIntegerControls constructed from RPTSCHED's curated list extracted from RSTConfig.cpp. We then use these components to form the RPTConfig instance in the RPTSCHED keyword handler while preserving the single argument RPTConfig constructor for use in the context of RPTSOL handling. This constructor does currently not support integer controls.
In particular,
- Split long lines.
- Switch to initialising objects, especially references, using
assignment syntax ('=') instead of construction ('{}').
- Move function opening braces to next line.
- Remove blanks before semicolons.
- Apply 'const' where reasonable.
- Move static objects into function-local scopes where reasonable.
- Reverse conditionals to enable "early continue".
- Rename workers::write_WELSPECS() to workers::wellSpecification().
This is in preparation to replacing hard-coded date stamps with
dynamic information.
bska
force-pushed
the
varnish-welspecs-report-impl
branch
from
0dd194c to
5468499
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In particular,
=) instead of construction ({}).constwhere reasonable.workers::write_WELSPECS()toworkers::wellSpecification().This is in preparation to replacing hard-coded date stamps with dynamic information.