Joakim Hove
32227236fa
Refactor AQUANCON implementation
2020-02-18 07:33:05 +01:00
Arne Morten Kvarving
c2aca49a2a
fixed: add begin/end members to BrineDensityTable
2020-02-17 15:13:36 +01:00
Joakim Hove
91c886465a
Merge pull request #1478 from akva2/vfp_boost_prune
...
Drop use of boost::multi_array in VFP classes
2020-02-17 13:57:32 +01:00
Joakim Hove
dd04b1d9df
Merge pull request #1467 from joakim-hove/rst-units
...
Add units to rst classes
2020-02-17 13:23:01 +01:00
Arne Morten Kvarving
fa572188fa
changed: avoid use of boost::multi_array in VFPProdTable
2020-02-17 13:08:14 +01:00
Arne Morten Kvarving
143c8ec3bf
changed: avoid use of boost::multi_array in VFPInjTable
2020-02-17 13:08:14 +01:00
Atgeirr Flø Rasmussen
fa5050f18a
Merge pull request #1474 from joakim-hove/schedule-add-rst-argument
...
Schedule add rst argument
2020-02-14 14:00:20 +01:00
Joakim Hove
0b3f885b33
Started to add skeleton load_rst function
2020-02-14 12:51:26 +01:00
Joakim Hove
5399c4f37f
Add optional RstState * argument to Schedule constructors
2020-02-14 12:05:24 +01:00
Atgeirr Flø Rasmussen
4516b23a14
Merge pull request #1410 from joakim-hove/group-multiple-phases
...
Support multiple phases in group injection
2020-02-14 11:10:37 +01:00
Tor Harald Sandve
e9318b1457
continue the work of allowing for phase dependent injection control
2020-02-14 09:30:58 +01:00
Joakim Hove
0b2dbf7fc2
GroupInjection is a map over phases + implement topup_phase
2020-02-14 09:30:58 +01:00
Joakim Hove
e4955d3d94
Merge pull request #1468 from joakim-hove/connection-segment
...
Connection segment
2020-02-14 06:49:43 +01:00
Joakim Hove
7da79ae532
Convert rst quantities to SI units
2020-02-14 06:43:25 +01:00
Joakim Hove
36662b2734
Use internal string trim functions instead of boost algorithm
2020-02-13 18:25:37 +01:00
Joakim Hove
1c07a8f251
Code to connect segment <-> connection in *one* function call
2020-02-13 16:02:21 +01:00
Arne Morten Kvarving
4f63172dc9
Merge pull request #1461 from akva2/use_std_filesystem
...
Replace boost::filesystem with std::filesystem
2020-02-13 15:01:02 +01:00
Kai Bao
8ddf71a67f
Merge pull request #1460 from joakim-hove/wellsegments-state
...
Wellsegments state
2020-02-13 14:39:29 +01:00
Arne Morten Kvarving
fb75bcd4e2
changed: use std::filesystem instead of boost::filesystem
...
since we still support g++-7, where filesystem is marked experimental,
we introduce a wrapper header and expose the namespace to use
as Opm::filesystem.
for gcc we unconditionally link with libstdc++fs in the python bindings.
the setup.py stuff links as c code, not c++ code, so it is not
automatically added on any gcc version. this might prove unportable
later.
2020-02-13 12:34:19 +01:00
Joakim Hove
ac2cac9f16
Remove member multiphase model from WellSegments
2020-02-13 11:03:14 +01:00
Joakim Hove
121386914b
WellSegments - remove member length_depth
2020-02-13 11:03:14 +01:00
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
b0fbb794d2
Remove WellSegments::operator<<
2020-02-13 09:23:33 +01:00
Joakim Hove
0525ea52a9
White space reformatting
2020-02-13 09:23:33 +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
Joakim Hove
425769712e
Merge pull request #1459 from akva2/janitoring
...
changed: initialize members to avoid potential unused warnings downstream
2020-02-11 13:30:01 +01:00
Arne Morten Kvarving
8d3ded8eb3
changed: initialize members to avoid potential unused warnings downstream
2020-02-11 10:51:42 +01:00
Arne Morten Kvarving
7876f530a1
changed: use std::regex instead of boost::regex
2020-02-11 08:49:08 +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
Bård Skaflestad
8225ea87d4
Merge pull request #1450 from joakim-hove/unitsystem-ecl-id
...
Add UnitSystem functionality to handle eclipse integer id
2020-02-05 20:42:51 +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
Joakim Hove
35a580f610
Add UnitSystem functionality to handle eclipse integer id
...
Writing of INTEHEAD keyword uses UnitSystem class instead of intermediate enum
UnitSystem.
2020-02-05 07:38:00 +01:00