Commit Graph

4709 Commits

Author SHA1 Message Date
Lars Petter Øren Hauge
5c68a0aaa8 Support CCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
7a91bebd61 Support FCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
102bd6b728 Support GCI(R/T) 2018-06-29 09:45:14 +02:00
Lars Petter Øren Hauge
fc3bc714fc Support WCI(R/T) 2018-06-29 09:45:14 +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
3ffcff1773
Merge pull request #442 from atgeirr/make-volume-check-optional
Add more flexibility to compareECL.
2018-06-27 18:55:06 +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
b109ab7822
Merge pull request #423 from akva2/codegen_rebuilds
changed: use a two-tiered process for code gen
2018-06-27 13:27:33 +02:00
Joakim Hove
5c55957718
Merge pull request #437 from rolk/0437_isatty
Include vendor-specific header for isatty function
2018-06-27 11:22:45 +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
5bce16c4e9 Reenable COMPLUMP tests 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
93f7f50eb7 Temporarily disable COMPLUMP test 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
Atgeirr Flø Rasmussen
08994de897
Merge pull request #436 from akva2/again_pass_by_ref
fixed: pass string by const ref
2018-06-26 10:57:38 +02:00
Joakim Hove
b8605532f4
Merge pull request #438 from rolk/0438_libtool
Improve status message when libtool is not present
2018-06-26 10:03:34 +02:00
Roland Kaufmann
2356cc35e5 Improve status message when libtool is not present
Libtool uses libtool archive files (.la) to determine how to do a
platform-specific link. To generate these files, it is necessary to have
libtool installed on the system, since it will only accept files with
its own particular version number embedded. If libtool is not installed,
you probably don't need the libtool archive files either, so no .la is
generated. However, the status message sounded like libtool was probed
but not found, and that this was something that you should install.

This patch modifies the status message to make it more clear way libtool
was probed, and what the consequence of a missing libtool is (i.e. no
.la file for you).
2018-06-26 09:22:03 +02:00
Roland Kaufmann
83b63213f4 Include vendor-specific header for isatty function
MS Windows doesn't contain POSIX functions in unistd.h, but rather has
its own versions in io.h.
2018-06-26 09:14:12 +02:00
Arne Morten Kvarving
32722f3b9c fixed: pass string by const ref 2018-06-26 08:39:34 +02:00
Bård Skaflestad
d0580c2180
Merge pull request #434 from bska/calculate-all-sumvec-for-restart
Summary: Calculate Independent Set of Vectors for Restart
2018-06-25 16:41:11 +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
a50c823873
Merge pull request #432 from joakim-hove/no-deck-ctx
Add no deck constructor to Eclipse3DProperties
2018-06-22 16:52:06 +02:00
Joakim Hove
ba04fbb1ad Add no deck constructor to Eclipse3DProperties 2018-06-22 13:27:19 +02:00
Arne Morten Kvarving
acef0e411d further adjustments to redhat packaging
nightly builds broke
2018-06-21 09:02:36 +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
Joakim Hove
fa3d6029b3
Merge pull request #430 from rolk/0430_unassigned
Add catch-all else clause to satisfy compiler
2018-06-20 17:32:32 +02:00
Joakim Hove
f7950ca458
Merge pull request #429 from akva2/quell_sgn_usgn_war
quell signed/unsigned comparison warnings
2018-06-20 14:59:43 +02:00
Joakim Hove
197b34d9ec
Merge pull request #428 from akva2/pass_const_ref
fixed: pass by const ref
2018-06-20 14:53:31 +02:00
Roland Kaufmann
c839f8dac7 Add catch-all else clause to satisfy compiler
Some compilers (notably GCC 5.4.0; default in Ubuntu 16.04) does not
do sufficient static analysis to determine that 'vect' is actually
exhaustively defined due to all indices being enumerated, and issue
a (spurious) warning that an unassigned value may be used.

This patch provides a default branch for the if-statements so that
'vect' is always assigned to, even in the eyes of the compiler. Since
entering this branch is unequivocally a bug, an assert is added so that
the null value is not mistakenly used.
2018-06-20 14:27:12 +02:00