OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 18:21:00 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,149 Commits 24 Branches 102 Tags 84 MiB
df86d01486
Commit Graph

10149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
df86d01486 Add Means of Initializing Analytic Aquifers From Restart Data 
This commit adds a new member function,

    AquiferInterface::initFromRestart()

that consumes a vector<data::AquiferData> constructed from
information in the restart file's SAAQ and XAAQ vectors.  At the
moment, we use the initial aquifer pressure, the total produced
liquid volume and the current aquifer pressure at restart.

We implement the interface's member function in terms of the virtual
function

    AquiferInterface::assignRestartData()

that must be overridden in derived classes.

Implement a trivial such function for Carter-Tracy aquifers, and a
function that only stores the current aquifer pressure for the
Fetkovich aquifer model.

Additionally, record whether or not the aquifer object was
initialised from a previous solution.  If so, don't reset total
produce liquid volumes or aquifer pressures to their base values
from the model input file.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
92cbdf3c63
Merge pull request #2207 from joakim-hove/wellstate-open-for-output 
Refactor WellState SHUT
 2019-12-04 18:16:19 +01:00
Atgeirr Flø Rasmussen
cfcbc7159c
Merge pull request #2208 from akva2/parallel_tests 
Add some more parallel tests
 2019-12-04 14:49:59 +01:00
Arne Morten Kvarving
581218f890 add parallel test with foam 2019-12-04 12:54:33 +01:00
Arne Morten Kvarving
f7b76e2b43 add parallel test with polymer 2019-12-04 12:54:33 +01:00
Arne Morten Kvarving
e7463c9c85 add parallel test with solvent 2019-12-04 12:54:33 +01:00
Arne Morten Kvarving
d5eea3252b added: allow DIR parameter in add_test_compare_parallel_simulation 2019-12-04 12:54:33 +01:00
Atgeirr Flø Rasmussen
8690a71aac
Merge pull request #2175 from totto82/fixGRUPInit 
fix issue when GRUP is used in WCONPROD and WCONINJE and NONE
 2019-12-04 12:31:37 +01:00
Tor Harald Sandve
c930ac9858 fix spelling 2019-12-04 11:39:26 +01:00
Tor Harald Sandve
9e64896054 fix issue when GRUP is used in WCONPROD and WCONINJE and NONE group control 
Use a bhp control when a well is controlled by a unvalied group control
 2019-12-04 11:37:00 +01:00
Atgeirr Flø Rasmussen
c922bf3b30
Merge pull request #2206 from joakim-hove/move-summarystate-eval 
SummaryState is updated at the end of simulator timestep
 2019-12-04 09:33:33 +01:00
Joakim Hove
ce9108a9d2 Refactor WellState SHUT 
- Move some WellState shut code to separate method.
- Add bool flag open_for_output_ to WellState to ensure that shut wells do not
  create output.
 2019-12-03 19:37:44 +01:00
Joakim Hove
ad00a3a891 SummaryState is updated at the end of simulator timestep 2019-12-03 15:52:47 +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