Atgeirr Flø Rasmussen
89e95b0789
Segment class: fix warnings and operator!= bug.
...
While silencing warnings in this class, it became apparent that
operator!=() was buggy, it was just a copy of operator==().
2018-06-28 17:01:27 +02:00
Atgeirr Flø Rasmussen
ffa4a8ef7b
Include required <array> header.
2018-06-28 14:45:30 +02:00
Joakim Hove
1f7a2d5459
Merge pull request #435 from joakim-hove/completion-support2
...
Completion support2
2018-06-28 09:58:36 +02:00
Atgeirr Flø Rasmussen
cfb3d34467
Add more flexibility to compareECL.
...
In particular:
- Grid comparison will now also check that the active cells are the same,
not just that the number of active cells is identical.
- In the grid comparison, checking volumes is now optional, from compareECL
this feature is used by passing the '-V' option on the command line.
2018-06-27 15:22:55 +02:00
Joakim Hove
4d3c143af4
Silnce warning
2018-06-26 12:36:49 +02:00
Joakim Hove
3a46555b6d
Reorder connection members to quell warning
2018-06-26 12:36:49 +02:00
Joakim Hove
a5cc1cfe48
Remove stale private functions
2018-06-26 12:36:49 +02:00
Joakim Hove
6095fda39f
Access connection direction directly
2018-06-26 12:36:49 +02:00
Joakim Hove
a8d1545947
Acces Connection sat table id directly
2018-06-26 12:36:49 +02:00
Joakim Hove
c212af9253
Remove stale function Connection::sameCoordinate()
2018-06-26 12:36:49 +02:00
Joakim Hove
6461cc2a81
Remove stale function Connection::fixDefaultIJ()
2018-06-26 12:36:49 +02:00
Joakim Hove
8895ee171a
Remove function Connection::shift_complnum()
2018-06-26 12:36:49 +02:00
Joakim Hove
90f6b46837
Remove stale method Well::addConnections( )
2018-06-26 12:36:49 +02:00
Joakim Hove
04a3a9ada5
WIP: cleaun up access methods
2018-06-26 12:36:49 +02:00
Joakim Hove
7a790a33bb
Remove stale forwards
2018-06-26 12:36:49 +02:00
Joakim Hove
d72c45cd62
Remove unused construtors
2018-06-26 12:36:49 +02:00
Joakim Hove
bcfb195a83
Rename completionIdx -> complnum and size_t -> int
2018-06-26 12:36:49 +02:00
Joakim Hove
0327393951
Add function to get completions
2018-06-26 12:35:30 +02:00
Joakim Hove
15dd449354
Changed WELSEGS implementation
2018-06-26 12:35:30 +02:00
Joakim Hove
ad2af10c5a
New implementation of WELLPI
2018-06-26 12:35:30 +02:00
Joakim Hove
9d16cc8ec4
New implementation of WELOPEN
2018-06-26 12:35:30 +02:00
Joakim Hove
1f1ecebec5
New implementation of COMPLUMP
2018-06-26 12:35:30 +02:00
Joakim Hove
fd3000cd31
WellConnections::add() does not inspect IJK
2018-06-26 12:35:30 +02:00
Joakim Hove
363b8589e6
Change handleCOMPDAT implementation
2018-06-26 12:35:30 +02:00
Joakim Hove
f3d82437fd
Using shared_ptr to manage connections
2018-06-26 12:35:30 +02:00
Joakim Hove
d52d4cc3a6
Add method WellConnections::addConnection()
2018-06-26 12:35:30 +02:00
Joakim Hove
7332ee4b18
Remove intializer list ctx + stale test
2018-06-26 12:35:30 +02:00
Joakim Hove
2cb5f62591
Add mutable WellConnections::getFromIJK()
2018-06-26 12:35:30 +02:00
Arne Morten Kvarving
32722f3b9c
fixed: pass string by const ref
2018-06-26 08:39:34 +02:00
Bård Skaflestad
c3a11a2fb5
Summary: Calculate Independent Set of Vectors for Restart
...
This commit ensures that the following set of vectors are stored/updated in
Summary::add_timestep()
for all active wells and well groups (including FIELD):
- Production rates for Oil, Water, Gas, and Reservoir Volume
(i.e., (O|W|G|V)PR).
- Cumulative production totals for Oil, Water, Gas, and
Reservoir Volume (i.e., (O|W|G|V)PT).
- Injection rates for Water and Gas (i.e., (W|G)IR).
- Cumulative injection totals for Water and Gas ((W|G)IT).
- Producing Water Cut (WCT).
- Producing Gas/Oil ratio (GOR).
We additionally capture the well bottom-hole pressure (WBHP) for all
wells that are active at the pertinent simulation step (sim_step).
Add an accessor function
const SummaryState& Summary::get_restart_vectors() const
that returns the 'prev_state' which contains these summary vectors
and add a set of unit tests to exercise the new interface.
2018-06-25 14:04:11 +02:00
Joakim Hove
ba04fbb1ad
Add no deck constructor to Eclipse3DProperties
2018-06-22 13:27:19 +02:00
Joakim Hove
aa04fee73f
Merge pull request #426 from joakim-hove/rename-connection-set
...
Rename connectionset and wellset
2018-06-21 08:14:08 +02:00
Arne Morten Kvarving
261f6ac270
fixed: pass by const ref
2018-06-20 12:56:10 +02:00
Joakim Hove
b22e00b92d
Rename WellSegment::numberSegment() WellSegment::size()
2018-06-20 11:48:02 +02:00
Joakim Hove
6c7f6d7afb
Rename SegmentSet -> WellSegments
2018-06-20 11:36:50 +02:00
Joakim Hove
dc318f731f
Rename ConnectionSet > WellConnections
2018-06-20 11:35:11 +02:00
Joakim Hove
bfbcd3e470
Minor refactor JFunc + TableManager
2018-06-20 09:26:50 +02:00
Tor Harald Sandve
fb0272f343
Add posibility to store closed completions in wellTestState
2018-06-19 10:37:44 +02:00
Joakim Hove
3975db2ff3
Rename CompletionSet -> ConnectionSet
2018-06-11 14:03:32 +02:00
Joakim Hove
d39db2f0db
Rename Completion -> Connection
2018-06-11 10:40:59 +02:00
Joakim Hove
088ba8a19a
Merge pull request #413 from joakim-hove/restart-icon-skip-inactive
...
Restart icon skip inactive
2018-06-08 12:49:37 +02:00
Joakim Hove
d168e9ff67
Merge pull request #414 from joakim-hove/welltest-state
...
Add WellTestState object to keep track of automatically closed wells
2018-06-07 12:41:05 +02:00
Joakim Hove
66de108c68
Revert "Add method for getting all the wells in the WellTestConfig"
2018-06-07 07:48:44 +02:00
Joakim Hove
58e4e5263e
Add WellTestState object to keep track of automatically closed wells
2018-06-07 07:42:03 +02:00
Joakim Hove
8fda1e036a
Merge pull request #415 from totto82/welltest
...
Add method for getting all the wells in the WellTestConfig
2018-06-06 15:45:06 +02:00
Tor Harald Sandve
3327d17c3f
Add method for getting all the wells in the WellTestConfig
2018-06-06 15:22:14 +02:00
Joakim Hove
d299e003b7
Merge pull request #411 from GitPaean/adding_vfp_numbers
...
VFP related needs to be processed even without THP target/limit
2018-06-05 17:34:29 +02:00
Joakim Hove
ccb7e5df3e
Use active completions when writng restart files.
2018-06-05 12:31:00 +02:00
Joakim Hove
1ee597206c
Add CompletionsSet constructor including only active connections.
2018-06-05 12:25:20 +02:00
Atgeirr Flø Rasmussen
3ad0b1c5ca
Fix forgotten <string> include.
2018-06-04 15:05:09 +02:00