Atgeirr Flø Rasmussen
8b110916e6
Add overloads to eval() and get() for simpler generic usage.
2020-02-24 16:05:48 +01:00
Arne Morten Kvarving
aceb3b443a
remove unused enum entry OpmFIL
2020-02-24 11:41:50 +01:00
Atgeirr Flø Rasmussen
f35529d7ff
Silence warnings.
...
- One class vs struct declaration.
- Unused variables in a test.
2020-02-21 10:49:41 +01:00
Joakim Hove
412909fa3a
Use std::size_t instead of int for size
2020-02-20 11:54:40 +01:00
Joakim Hove
a3c634b1f8
Merge pull request #1458 from joakim-hove/eclstate-aquifer-config
...
Eclstate aquifer config
2020-02-20 08:25:25 +01:00
Joakim Hove
aed8c78af5
Move RestartConfig from EclipseState to Schedule
2020-02-19 12:35:07 +01:00
Joakim Hove
b3601c7357
Merge pull request #1489 from akva2/more_boost_prune
...
Continue replacing boost usage
2020-02-19 12:29:06 +01:00
Arne Morten Kvarving
83a7cd04c3
remove unused boost includes
...
and deal with missing include fallout
2020-02-19 09:51:46 +01:00
Joakim Hove
01aa3692fa
Add AquiferConfig to EclipseState
2020-02-18 18:07:02 +01:00
Joakim Hove
7daf77ef59
Added AquiferConfig class
2020-02-18 15:30:09 +01:00
Joakim Hove
a4d745b895
Merge pull request #1484 from joakim-hove/brine-table-size
...
Add size() method to BrineDesityTable
2020-02-18 15:11:25 +01:00
Joakim Hove
fc82988c9c
Merge pull request #1475 from joakim-hove/schedule-addwell-refactor
...
Add new Schedule::addWell() overload + update Well constructor args
2020-02-18 11:58:37 +01:00
Joakim Hove
084ff09e78
Merge pull request #1476 from joakim-hove/timemap-skiprest
...
Internalize the existence of SKIPREST in the TimeMap
2020-02-18 11:57:24 +01:00
Joakim Hove
c5e1826498
Add size() method to BrineDesityTable
2020-02-18 07:49:48 +01:00
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
Joakim Hove
cad54feafb
Internalize the existence of SKIPREST in the TimeMap
2020-02-16 17:53:27 +01:00
Joakim Hove
1b0af2954d
Add new Schedule::addWell() overload + update Well constructor args
2020-02-14 14:21:08 +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
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