Commit Graph

10138 Commits

Author SHA1 Message Date
Atgeirr Flø Rasmussen
d96e0a2478 Refactor solving functions to take control objects directly.
This allows us to avoid some very hacky manipulation of the Well object.
2019-12-05 12:40:35 +01:00
Atgeirr Flø Rasmussen
d4433b80b5 Improve/fix well potential calculations for MultiSegmentWell.
Includes fixes for bhp-based potentials, and an implementation for thp-based
potentials similar to that for StandardWell.
2019-12-04 11:01:45 +01:00
Atgeirr Flø Rasmussen
becb29cec6
Merge pull request #2203 from joakim-hove/apply-action-output-update
Update output from applyActions() to show date
2019-12-03 09:02:02 +01:00
Joakim Hove
deb397cf0e Update output from applyActions() to show date 2019-12-03 00:44:08 +01:00
Bård Skaflestad
0a6b5f0ea9
Merge pull request #2202 from akva2/janitoring
Janitoring
2019-12-02 19:56:16 +01:00
Arne Morten Kvarving
8d1da2ca06 changed: use std::make_tuple
avoid explicit init list constructor with gcc5
2019-12-02 18:35:35 +01:00
Arne Morten Kvarving
272e63410d fixed: wrap symbols unused without MPI in HAVE_MPI 2019-12-02 18:34:16 +01:00
Atgeirr Flø Rasmussen
0edecb9a78
Merge pull request #2196 from totto82/smallTime
Add option for throwing for small time steps
2019-12-02 12:28:12 +01:00
Tor Harald Sandve
6d07aefef6
Merge pull request #2149 from goncalvesmachadoc/patch-1
Delete few thermal keywords from list
2019-12-02 10:17:58 +01:00
Tor Harald Sandve
b577f294b5 Add option for throwing for small time steps 2019-12-02 09:56:19 +01:00
Joakim Hove
190b431f42
Merge pull request #2201 from joakim-hove/add-PORO
Add PORO to testdata
2019-11-30 19:47:02 +01:00
Joakim Hove
2a45199d37 Add PORO to testdata 2019-11-30 13:52:21 +01:00
Joakim Hove
6d02923d69
Merge pull request #2200 from joakim-hove/action-eval-list-wells
List the matching wells for Action eval
2019-11-29 19:20:38 +01:00
Joakim Hove
f97b76a9b5 List the matching wells for Action eval 2019-11-29 19:18:38 +01:00
Joakim Hove
e74c451b7b
Merge pull request #2198 from joakim-hove/add-PORO
Add PORO to testdata
2019-11-29 13:11:25 +01:00
Joakim Hove
d4b9e95dfe Add PORO to testdata 2019-11-29 11:38:00 +01:00
Arne Morten Kvarving
42a268a3cf
Merge pull request #2193 from akva2/add_restart_serialization_test
added: test for serializations in ParallelRestart
2019-11-28 15:19:32 +01:00
Arne Morten Kvarving
e235fced21
Merge pull request #2194 from akva2/rockcomp_test
add test case for rockcomp
2019-11-28 11:52:19 +01:00
Arne Morten Kvarving
414f64f46d changed: only update reference data for tests marked as failures 2019-11-28 11:34:42 +01:00
Tor Harald Sandve
18ecd3fd2b
Merge pull request #2173 from joakim-hove/actionx-supported
Remove keywords from list of missing features
2019-11-28 10:35:03 +01:00
Arne Morten Kvarving
6a630f9648 add test case for rockcomp 2019-11-28 09:55:47 +01:00
Arne Morten Kvarving
586b83e9b9
Merge pull request #2174 from akva2/add_rh8_packaging
added: support rhel8
2019-11-28 09:15:23 +01:00
Arne Morten Kvarving
1ca7bdfe47 added: test for serializations in ParallelRestart 2019-11-28 08:58:56 +01:00
Arne Morten Kvarving
0d7b7f6e00
Merge pull request #2189 from akva2/add_diff_as_comment
Add ascii diff of changes to data update PR
2019-11-28 08:38:46 +01:00
Tor Harald Sandve
ad7af41a44
Merge pull request #2180 from totto82/groupEvent
Group event
2019-11-28 08:23:21 +01:00
Joakim Hove
917808cb20
Merge pull request #2190 from joakim-hove/change-sched-constructor
Use EclipseState based Schedule constructor
2019-11-27 15:02:04 +01:00
Tor Harald Sandve
853a726bb2 fix after rebase 2019-11-27 14:56:10 +01:00
Joakim Hove
3d1eeda7ed
Merge pull request #2191 from joakim-hove/actnum-fixup
Use active index in RelpermDiagnostic_impl
2019-11-27 13:34:44 +01:00
Tor Harald Sandve
cab2f4b41f use common WellGroupEvent map 2019-11-27 13:12:53 +01:00
Tor Harald Sandve
49b5883ff7 Clean-up output message for group 2019-11-27 13:08:25 +01:00
Tor Harald Sandve
2c84970314 honor group event 2019-11-27 13:08:25 +01:00
Joakim Hove
6e4d5b1e12 Use active index in RelpermDiagnostic_impl 2019-11-27 12:10:00 +01:00
Joakim Hove
099fbc05d0 Use EclipseState based Schedule constructor 2019-11-27 11:39:16 +01:00
Joakim Hove
4b2960c0d3
Merge pull request #2188 from joakim-hove/change-sched-constructor
Use EclipseState based Schedule constructor
2019-11-27 10:03:30 +01:00
Arne Morten Kvarving
a7332e16cf added: generate ascii diff in update_reference_data.sh 2019-11-27 09:17:37 +01:00
Arne Morten Kvarving
2a8494c75f
Merge pull request #2186 from akva2/add_parallel_well_curves
changed: use a separate output dir in the parallel norne test
2019-11-27 08:31:24 +01:00
Joakim Hove
b35e5c10b6 Use EclipseState based Schedule constructor 2019-11-27 00:18:28 +01:00
Joakim Hove
e7a837e463
Merge pull request #2167 from joakim-hove/pass-actnum
Pass actnum
2019-11-26 20:46:36 +01:00
Joakim Hove
2e6b1e36be Pass actnum mapping to relperm diagnostic 2019-11-26 19:26:24 +01:00
Arne Morten Kvarving
5ec806c4d8 changed: use a separate output dir in the parallel norne test
this way we get curves for both the serial and parallel runs in the well plots
2019-11-26 15:10:47 +01:00
Arne Morten Kvarving
5e20144869
Merge pull request #2187 from akva2/rename_accessor
changed: nncdata() has been renamed to data()
2019-11-26 14:29:00 +01:00
Arne Morten Kvarving
79dc067eb1 changed: nncdata() has been renamed to data() 2019-11-26 13:29:40 +01:00
Atgeirr Flø Rasmussen
937369166d
Merge pull request #2182 from blattms/parallel-restart-fixes
ParallelRestart: use references and allow non-default template parame…
2019-11-26 11:14:14 +01:00
Atgeirr Flø Rasmussen
5d5250d568
Merge pull request #2181 from atgeirr/remove-unused-well-code
Remove unused Wells struct and all its friends
2019-11-25 13:23:21 +01:00
Markus Blatt
a0650012c3 ParallelRestart: use references and allow non-default template parameters.
packSize now uses a reference to map/unordered_map to prevent copying.
In addition we always specify all template parameters for the containers to
allow for sending data if non-default ones are used.
2019-11-25 13:04:40 +01:00
Atgeirr Flø Rasmussen
e718bf3ccf Remove unused code. 2019-11-25 11:00:21 +01:00
Atgeirr Flø Rasmussen
bddeaba880 Delete obsolete include directives and functions.
Also make other minor adjustments, in particular moving the function
getCubeDim() from WellsManagerDetail to WellHelpers.hpp.
2019-11-25 10:58:44 +01:00
Bård Skaflestad
334acd18ad
Merge pull request #2164 from atgeirr/remove-wells-struct-rebased
Avoid using the Wells struct.
2019-11-25 09:56:06 +01:00
Atgeirr Flø Rasmussen
87188f5862 Avoid using the Wells struct. 2019-11-25 08:36:18 +01:00
Atgeirr Flø Rasmussen
cab0724a26
Merge pull request #2119 from blattms/fix-multiple-usage-printing-parallel
Only print usage information on one processes.
2019-11-22 15:23:27 +01:00