OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 20:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,161 Commits 24 Branches 101 Tags 75 MiB
9266b8bd1f
Commit Graph

10161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
9266b8bd1f adding a running test for wsegsicd 2019-12-06 10:15:12 +01:00
Kai Bao
196e997e79 various fixes and improvements 2019-12-06 10:15:11 +01:00
Kai Bao
3d7f0efe07 various fixes. 
the most important one is that the formulation is changed in the recent
version
 2019-12-06 10:14:20 +01:00
Kai Bao
cc77c0e826 importing the old WSEGSICD implementation 
with small adjustments to make it compile
 2019-12-06 10:14:20 +01:00
Bård Skaflestad
c256bfdfa4
Merge pull request #2170 from atgeirr/msw-thp-potential 
Compute well potential of multi-segment wells with a THP constraint
 2019-12-06 10:02:50 +01:00
Kai Bao
975a7a6c50
Merge pull request #2197 from bska/load-aquifer-data 
Load aquifer data
 2019-12-05 15:08:15 +01:00
Bård Skaflestad
ce1e0691a8 Aquifer Restart: Address Review Comments 
Mostly 'throw'ing in the case of unsupported operations.  While
here, also remove an unused header.
 2019-12-05 13:41:05 +01:00
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
Bård Skaflestad
143b45ed52 EclWriter: Initialize Aquifers From Restart Data 
This commit calls the aquifer model's 'initFromRestart' function if
the loadParallelRestart() function happens to return any aquifer
data from the restart file.  Such data is currently limited to two
items of information for analytic aquifers (from XAAQ vector), but
future extensions are likely.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
8a764568e1 EclProblem: Provide Mutable Access to Aquifer Model Object 
This commit adds a new public member function,

    EclProblem::mutableAquiferModel()

that returns a read/write reference to the contained EclAquiferModel
object.  The immediate use-case is initializing analytic aquifers
from restart data.
 2019-12-05 09:41:21 +01:00
Bård Skaflestad
4c4a893781 Aquifer Model: Add Initialization from Restart Data 
This commit adds a new member function,

    initFromRestart()

to the EclBaseAquiferModel and the BlackoilAquiferModel.  The former
does nothing, the latter calls AquiferInterface::initFromRestart()
on the contained analytic aquifer objects.
 2019-12-05 09:41:21 +01:00
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
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
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