Commit Graph

4881 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
7cedf056d7 quell signed/unsigned comparison warnings 2018-06-20 13:38:52 +02:00
Arne Morten Kvarving
261f6ac270 fixed: pass by const ref 2018-06-20 12:56:10 +02:00
Arne Morten Kvarving
d1d9e214ce
Merge pull request #427 from akva2/add_mpich
add mpich packages to redhat
2018-06-20 12:41:41 +02:00
Arne Morten Kvarving
d2d9128e6a add mpich packages to redhat 2018-06-20 12:30:45 +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
d4d2b813dd
Merge pull request #425 from joakim-hove/completion-refactor
Completion refactor
2018-06-20 11:00:42 +02:00
Joakim Hove
501b1dc760 Remove stale test 2018-06-20 09:27:02 +02:00
Joakim Hove
bfbcd3e470 Minor refactor JFunc + TableManager 2018-06-20 09:26:50 +02:00
Joakim Hove
2574dc7542
Merge pull request #424 from totto82/addCompletionsToTestState
Add posibility to store closed completions in wellTestState
2018-06-19 20:54:13 +02:00
Tor Harald Sandve
fb0272f343 Add posibility to store closed completions in wellTestState 2018-06-19 10:37:44 +02:00
Arne Morten Kvarving
3085243117
Merge pull request #302 from blattms/allow-dune-to-find-dune.module
Allow DUNE modules to locate the dune.module files during CMake run.
2018-06-18 13:46:10 +02:00
Markus Blatt
c6536c0b2f Allow DUNE modules to locate the dune.module files during CMake run.
For this we need to set <dune-module>_PREFIX either to where the module
is installed to or the source directory for a build with uninstalled
modules.
2018-06-18 12:47:53 +02:00
Arne Morten Kvarving
5dba20496a changed: use a two-tiered process for code gen
to avoid some unwanted rebuilds
2018-06-18 10:07:52 +02:00
Joakim Hove
97bb1c3413
Merge pull request #422 from alfbr/master
The MESSAGES keyword needs a thirteenth item
2018-06-18 08:55:34 +02:00
Alf B. Rustad
0d0e123735 Fixed Json syntax 2018-06-18 08:47:02 +02:00
Alf B. Rustad
768326527a The MESSAGES keyword needs a thirteenth item 2018-06-15 13:05:04 +02:00
Atgeirr Flø Rasmussen
df289d455b
Merge pull request #418 from joakim-hove/grdecl-double
Use double overload for eclGrid
2018-06-15 12:32:16 +02:00
Joakim Hove
6b9e0c5ef8
Merge pull request #419 from joakim-hove/rename-completion
Rename Completion -> Connection
2018-06-12 13:22:48 +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
b3eb6b58eb Use double overload for eclGrid 2018-06-08 14:04: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
46ab6dd8e1
Merge pull request #416 from OPM/revert-415-welltest
Revert "Add method for getting all the wells in the WellTestConfig"
2018-06-07 12:40:54 +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