Save and Restore ICD Scaling Factor for SICDs Too #3978
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 am creating this PR in draft mode because we will need considerable testing before we enable this in the master branch. Furthermore, some of the unit tests fail on my local development machine so I need to analyse those failures before marking this as "ready for review". |
bska
changed the title
bska
force-pushed
the
load-icd-scaling-factor
branch
6 times, most recently
from
46e4ebe
to
724686d
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
8 times, most recently
from
3f6b392
to
9091496
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
14 times, most recently
from
ab2f5e2
to
0c352bc
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
9 times, most recently
from
4ab3cdb
to
65ad93e
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
3 times, most recently
from
95573b4
to
8965de6
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
7 times, most recently
from
166fda3
to
ac1b2a2
Compare
bska
force-pushed
the
load-icd-scaling-factor
branch
3 times, most recently
from
1f90c9c
to
75d0a4a
Compare
The ICD length must not be converted as if it is a volumetric rate.
Mostly by adjusting whitespace, and by switching to using compiled strings for item references. While here, switch to using defaulted default constructors where possible
In particular, add such constructors to the SICD, AutoICD, and Valve types. While here, switch to using the native 'int' value for the ICD status and move conversion to the individual .cpp files.
That way, we defer responsibility to the classes which know most about how to restore their internal state from restart information.
In particular, switch to using a native 'int' to represent the segment type, and defer inspecting the value until we get to the Segment::Segment(const RstSegment&) constructor. That way, the low-level restart information input routines do not depend on higher-level type information.
While here, extract common item handing for AICDs and SICDs out to a separate helper routine to avoid repeating the logic on the output side.
bska
force-pushed
the
load-icd-scaling-factor
branch
from
75d0a4a
to
097eb5b
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.
Previously, we would save this information–but never restore it–only for autonomous ICDs ("AICD"). This PR expands our restart support for segment level "devices" (Spiral ICDs, Autonomous ICDs, Valves) to utilise more of the information that is available in the restart file. We introduce constructors for the device types from
RstSegmentand defer the reconstitution to those constructors.While working on this, I also noticed a problem in the current master sources. The
icd_lengthis treated as if it represents a volumetric flow rate at reservoir conditions, but it must be treated as a length.