Commit Graph

2267 Commits

Author SHA1 Message Date
Joakim Hove
8657d59696 Remove name member from WellSegments class 2020-02-13 11:03:14 +01:00
Joakim Hove
b5d3af49e9 Remove variables: depth, length and volume from WellSegmentSet 2020-02-13 11:03:14 +01:00
Joakim Hove
185c715cff Remove WellSegments::operator<<() 2020-02-13 11:03:14 +01:00
Joakim Hove
bd688edfde Wellsegments are created with constructor 2020-02-13 11:03:14 +01:00
Joakim Hove
cac1dac893 Remove unused bool flag 2020-02-13 11:03:14 +01:00
Joakim Hove
b3d306482c Use const ref argument 2020-02-13 11:03:14 +01:00
Joakim Hove
ade0a78a06 Remove mutable accessors to set volume, depth and length 2020-02-13 11:03:14 +01:00
Joakim Hove
dd49f359f5 Grouped mutable accessors 2020-02-13 11:03:14 +01:00
Joakim Hove
921a68fc73 Merge pull request #1463 from joakim-hove/segment-updates
Segment updates
2020-02-13 07:47:27 +01:00
Joakim Hove
9bed25f035 Use common ICDStatus class for both Valve and SpiralICD 2020-02-12 15:09:26 +01:00
Joakim Hove
e2b58cecda Inetrnalize segment type in proper enum 2020-02-12 14:18:24 +01:00
Joakim Hove
f80160e6c0 Add icd file with status enum common to SpiralICD and Valve 2020-02-12 14:15:13 +01:00
Joakim Hove
963387da56 Removed invalid_value as member variable 2020-02-12 10:01:45 +01:00
Joakim Hove
cd990599b4 The type of a segment must be explicitly initialized 2020-02-12 10:00:31 +01:00
Arne Morten Kvarving
8d3ded8eb3 changed: initialize members to avoid potential unused warnings downstream 2020-02-11 10:51:42 +01:00
Joakim Hove
1a1b796cb6 Refactor Aquifetp class
- Make constructor and operator== for struct
- Make constructor and accessor for serialization
- Initial pressure stored in std::pair<bool, double>
- Add size() and begin() and end()
- Remove unused memmbers cell_id and inftableID
- Use ParserKeywords::AQUIFETP class instead of string lookup
2020-02-07 07:30:22 +01:00
Joakim Hove
140a1c0bf3 Add accessor and constructor for serialization 2020-02-07 07:30:22 +01:00
Joakim Hove
f91630a62d Add operator== to AQuiferCT
Initial pressure is stored as std::pair<bool, double> instead of
std::shared_ptr<double>.
2020-02-07 07:30:22 +01:00
Joakim Hove
f666ab0544 Refactored the AquiferCT class to construct AQUCT_data struct 2020-02-07 07:30:22 +01:00
Joakim Hove
a505f59096 Add begin(), end() and size() to AquiferCT class 2020-02-07 07:30:22 +01:00
Joakim Hove
ca4c10f810 Use TableManager in AquiferCT constructor 2020-02-07 07:30:22 +01:00
Joakim Hove
42fc0666be Rst connection - use proper enums for direction and state 2020-02-06 11:59:10 +01:00
Joakim Hove
8f213b19d6 Merge pull request #1447 from akva2/simplify_tuning
changed: simplify Tuning handling
2020-02-05 07:50:41 +01:00
Arne Morten Kvarving
dab3ba807a changed: simpify Tuning handling
make Tuning a simple struct, and store as a DynamicState<Tuning>.

in the process the unused setTuningInitialValue is removed. it was
only used in unit tests and seem like a leftover
2020-02-04 10:42:43 +01:00
Joakim Hove
3c5ae4bf44 Add Schedule::addWell() overload which does not take Deck arguments 2020-01-30 10:38:41 +01:00
Bård Skaflestad
19ecc3d30e Consider Active Phases When Initializing Satfunc Endpoints
This commit passes the run's notion of its active phases, an object
of type Opm::Phases, through to the initialisation layer for the
saturation functions' scaling properties.  In particular, this
allows us to discriminate between the phases and to not index into
tables or properties that would not be appropriate (e.g., maximum
gas saturation (SGU) in a simulation run without active gas).

Moreover, we now have enough information to know to look for SOF2 in
two-phase run using family II saturation function keywords.  These
changes are necessary in order to extend Flow's support for the
FILLEPS output request to two-phase runs.
2020-01-29 16:34:15 +01:00
Joakim Hove
936f142233 Add class RockConfig under SimulationConfig 2020-01-29 15:04:31 +01:00
Joakim Hove
76229f95be Made IOConfig a member of RestartConfig 2020-01-29 00:27:35 +01:00
Joakim Hove
7036c3ee45 Remove unused constructor 2020-01-29 00:27:35 +01:00
Joakim Hove
3730cadcd8 Minor reorder 2020-01-29 00:27:35 +01:00
Joakim Hove
0b19eb7ffb Remove unused method declarations 2020-01-29 00:27:35 +01:00
Arne Morten Kvarving
5e546086fb Merge pull request #1435 from akva2/hide_fprops_ifaces
changed: hide the templated 'has' and 'get' interfaces in FieldPropsManager
2020-01-28 15:33:49 +01:00
Arne Morten Kvarving
ae10af208f changed: hide the templated 'has' and 'get' interfaces in FieldPropsManager
motivation: an upcoming parallel frontend to the field props manager.
templated functions cannot be virtualized, and thus having these exposed
would give a great chance of confusing the users in the downstream
code, where properties would be caught from the (potentially) empty
backend instead of from the frontend.
2020-01-28 14:31:25 +01:00
Joakim Hove
79a75eba2a Add public accessor TimeMap::restart_offset() 2020-01-28 12:49:27 +01:00
Joakim Hove
d1608ea2cf Merge pull request #1430 from joakim-hove/ecl-bc
Add class to internalize BC keyword - and add to SimulationConfig
2020-01-28 11:03:43 +01:00
Joakim Hove
c9f6326dc5 Add class to internalize BC keyword - and add to SimulationConfig 2020-01-27 11:55:15 +01:00
Bård Skaflestad
7c1b77ec5d Internalise TOLCRIT Keyword
This commit internalises the TOLCRIT keyword into the EclipseState
for subsequent use in determining critical saturations when
processing saturation function keywords such as SGOF and SOF3.
Specifically, we add a new type

    Opm::SatFuncControls

that, at present, stores only the TOLCRIT data item (defaulted to
the keyword's default value).  Client code can then retrieve the
value by calling the

    SatFuncControls::minimumRelpermMobilityThreshold()

member function.

Add a new data member of this type to the Opm::Runspec class so that
we complete the chain from EclipseState, and a few simple unit tests
to exercise the expected functionality.
2020-01-24 20:58:38 +01:00
Joakim Hove
db8ded1f09 Pass restart info to TimeMap constructor 2020-01-24 19:27:53 +01:00
Arne Morten Kvarving
1c2a284ee8 remove unused member m_first_restart_step from IOConfig 2020-01-24 13:13:22 +01:00
Joakim Hove
fd698139f5 Remove special code for serialization 2020-01-22 18:50:59 +01:00
Bård Skaflestad
2539a0d0e9 Merge pull request #1425 from joakim-hove/time-map-immutable
Time map immutable
2020-01-22 18:45:34 +01:00
Joakim Hove
fc9958bb0c Remove TimeMap( start_time ) constructor 2020-01-22 16:56:42 +01:00
Joakim Hove
63e99fb807 Make mutable accessors in TimeMap private 2020-01-22 16:23:37 +01:00
Joakim Hove
2d8151808f Add TimeMap(std::vector<std::time_t>& ) constructor 2020-01-22 16:23:37 +01:00
Arne Morten Kvarving
448ea5f3ab added: gravity flag to InitConfig 2020-01-22 12:47:39 +01:00
Joakim Hove
51daf43cef Merge pull request #1422 from akva2/noecl_flush_prestate
More serialization preparation
2020-01-22 06:30:57 +01:00
Arne Morten Kvarving
6a1acc15b8 make FaultCollection constructible from variables
also add accessor and equality operator
2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
d5d5a01503 make Fault constructible from variables
also add default constructor and accessor
2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
86b3566229 make FaultFace constructible from variables
also add default constructor and equality operator
2020-01-21 15:22:10 +01:00
Arne Morten Kvarving
be799586c8 make TransMult constructible from variables
also add default constructor and equality operator
2020-01-21 15:22:10 +01:00