OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-16 07:31:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,200 Commits 24 Branches 102 Tags 90 MiB
d4890f81f5
Commit Graph

10200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
d4890f81f5 Use Dune communicator instead of raw MPI call 2019-12-14 13:54:06 +01:00
Joakim Hove
f07938365b
Merge pull request #2216 from joakim-hove/reset-actnum 
Update the internal ACTNUM in the FieldPropsManager
 2019-12-14 11:17:32 +01:00
Atgeirr Flø Rasmussen
f769b97198
Merge pull request #2225 from atgeirr/fix-zero-wconprod 
Shut wells under zero WCONPROD when disallowing crossflow
 2019-12-13 14:41:52 +01:00
Atgeirr Flø Rasmussen
f09dcda21c Shut production well if zero rate and disallowing crossflow. 2019-12-13 11:08:36 +01:00
Atgeirr Flø Rasmussen
a89e8f6457 Complain less about missing operability checking. 
Do not give a warning for production wells or history wells,
respect the EnableWellOperabilityCheck flag. This is identical
to the behaviour of StandardWell. There will now only be a
warning for producers in prediction mode.
 2019-12-13 11:00:01 +01:00
Atgeirr Flø Rasmussen
c8e1f61050 Ensure open_for_output_ flag is set to true in init(). 2019-12-13 10:59:24 +01:00
Joakim Hove
ec68f4b113
Merge pull request #2219 from stefoss23/alternating_keywords 
added alternating keywords.
 2019-12-13 09:40:51 +01:00
Joakim Hove
f4aa118cc4 Update the internal ACTNUM in the FieldPropsManager 2019-12-12 12:00:51 +01:00
Atgeirr Flø Rasmussen
b81faa9221
Merge pull request #2199 from GitPaean/support_wsegvalv 
Support WSEGVALV
 2019-12-11 21:07:15 +01:00
Kai Bao
61ed33c458 implementing the support for WSEGVALV 2019-12-11 14:43:09 +01:00
Steinar Foss
435f90ecc8 added alternating keywords. 2019-12-11 11:39:16 +01:00
Markus Blatt
87b631e15b
Merge pull request #2218 from blattms/use-active-cells-wehen-filtering 
Use ActiveGridCells instead of EclipseGrid when filtering connections.
 2019-12-11 09:02:37 +01:00
Atgeirr Flø Rasmussen
807375811e
Merge pull request #2217 from atgeirr/silence-override-warnings 
Add override to silence warnings.
 2019-12-10 12:39:54 +01:00
Markus Blatt
e7f7ad2ddc Use ActiveGridCells instead of EclipseGrid when filtering connections. 
The function signature has changed upstream.
 2019-12-10 11:50:07 +01:00
Atgeirr Flø Rasmussen
63c766cd30 Add override to silence warnings. 2019-12-10 11:37:52 +01:00
Markus Blatt
201887f283
Merge pull request #2195 from akva2/simplify_parallelrestart_new_types 
changed: use a macro to declare prototypes in ParallelRestart.hpp
 2019-12-10 08:36:41 +01:00
Tor Harald Sandve
3cccb47847
Merge pull request #2066 from dr-robertk/PR/ebos-oilwaterpolymer 
[feature][ebos] Adding oil-water-polymer option of ebos.
 2019-12-10 08:36:16 +01:00
Robert Kloefkorn
44e4ea3cdf [feature][ebos] Adding oil-water-polymer option of ebos. 2019-12-09 18:16:23 +01:00
Joakim Hove
510fb4a4ae
Merge pull request #2214 from joakim-hove/enable-3dprops-testing 
Add cmake switch to enable testing of new 3D property implementation
 2019-12-07 13:33:56 +01:00
Joakim Hove
5259fb93ca Add cmake switch to enable testing of new 3D property implementation 2019-12-07 12:34:07 +01:00
Markus Blatt
712a902c37
Merge pull request #2205 from andrthu/adjacency-change 
Remove non-contributing computations in parallel solver by changing matrix sparsity pattern.
 2019-12-06 15:15:50 +01:00
Atgeirr Flø Rasmussen
52b9ecbfd5
Merge pull request #2210 from totto82/gconsalesump 
Support for Gconsale and Gconsump
 2019-12-06 15:01:49 +01:00
Atgeirr Flø Rasmussen
4bad782a1f
Merge pull request #2178 from GitPaean/support_wsegsicd_rebased 
Support WSEGSICD implementation
 2019-12-06 14:20:40 +01:00
Joakim Hove
4ad0074552
Merge pull request #2204 from joakim-hove/shut-wells-timestep 
Evaluate ACTIONX at the end of every timestep
 2019-12-06 13:29:19 +01:00
Joakim Hove
dc5340046a Call applyActions at the end of every timestep 2019-12-06 13:18:49 +01:00
Kai Bao
799997d70a fixing a mistake was introduced when rebasing 2019-12-06 10:34:58 +01:00
Kai Bao
ab9d175e8d addressing the reviewing comments for PR#2178 2019-12-06 10:15:12 +01:00
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
Tor Harald Sandve
4d8d9a7a05 Fix vrep 2019-12-06 09:04: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
Tor Harald Sandve
2c9797ec50 Always update group target reduction 2019-12-05 13:08:17 +01:00
Tor Harald Sandve
ad21da87ca fix after rebase 2019-12-05 13:08:17 +01:00
Tor Harald Sandve
26a01794bf A group can both be injection and a production group 2019-12-05 13:08:17 +01:00
Tor Harald Sandve
876f5587e5 Add GCONSALE and fix conversion from UDA 2019-12-05 13:08:17 +01:00
Tor Harald Sandve
5dbf0927d3 Add support for GCONSUMP 2019-12-05 13:08:17 +01:00
Tor Harald Sandve
615e4422b9 BUGFIX REIN 2019-12-05 13:08:17 +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
andrthu
eb83cef717 Remove tab 2019-12-04 15:44:37 +01:00
andrthu
5f68b71d0f Remove makeOverlapInvalid 2019-12-04 15:43:31 +01:00
andrthu
0829d1fa3e fix mistake in flexible 2019-12-04 15:39:42 +01:00