OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
10,163 Commits 31 Branches 117 Tags
799997d70a1473aeff287bc8ba9a6e7e3b0345a1
Commit Graph
6398 Commits
Author SHA1 Message Date
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 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
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 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
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
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
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
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
Tor Harald Sandve ad7af41a44 Merge pull request #2180 from totto82/groupEvent 
Group event
 2019-11-28 08:23:21 +01:00
Tor Harald Sandve 853a726bb2 fix after rebase 2019-11-27 14:56:10 +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 2e6b1e36be Pass actnum mapping to relperm diagnostic 2019-11-26 19:26:24 +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
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
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
Bård Skaflestad 26c8d78eac Merge pull request #2155 from blattms/print-mpi-omp-size 
Print number of MPI/OMP threads at start and end.
 2019-11-21 16:06:37 +01:00
Joakim Hove 02bdf4c699 Merge pull request #2165 from joakim-hove/ecl-eps-grid-extract 
Use EclEpsGridProperties constructor
 2019-11-21 11:33:24 +01:00
Joakim Hove 2f7e1c2e10 Remove ENDACTIO from list of unsupported keywords 2019-11-20 15:48:53 +01:00
Joakim Hove 5d1dba4686 Remove FIPNUM from list of unsupported keywords 2019-11-20 15:47:26 +01:00
Joakim Hove e79723b5c1 Remove ACTIONX from list of missing features 2019-11-20 15:35:59 +01:00
Steinar Foss 3d2892fbdb added 'special' keywords to MissingFeatures. 2019-11-20 15:31:11 +01:00
Joakim Hove 1faa39cff1 Use EclEpsGridProperties to access SATNUM value 2019-11-20 13:59:47 +01:00
Joakim Hove 22bb38e5cc Remove unused class RockFromDeck 2019-11-19 23:23:30 +01:00
Joakim Hove c80d72e27c Removed unused perm and ntg arguments to Well construction 2019-11-19 23:23:30 +01:00
Markus Blatt 5c34b843f1 Use process instead of processor for MPI. 2019-11-19 15:56:18 +01:00
Markus Blatt b4ec2f0611 Use correct number of threads when printing banner. 
At that stage flow did not set the number of thread in the case where
OMP_NUM_THREADS is not defined. That happens in setupParallelism which
is called when the simulator is run. Hence we have to manually compute
the number of threads similar to there.
 2019-11-19 15:45:50 +01:00
Markus Blatt afc76a8b27 Print number of MPI/OMP threads at start and end. 2019-11-19 15:45:50 +01:00
Joakim Hove 571c24d10c Use EclEpsGridProperties constructor 2019-11-18 12:22:35 +01:00
Atgeirr Flø Rasmussen 4aa79bf39c Merge pull request #2152 from GitPaean/wip_fixing_aquifer_2 
fixing and improvement of the Aquifer models
 2019-11-18 11:19:15 +01:00
Kai Bao 0c6adbbba0 some small cleaning up for Aquifer models 
there should be no functional change.
 2019-11-17 10:37:10 +01:00
Kai Bao eea833ced2 correcting the way of calculate initial aquifer pressure 
for AquiferFetkovich.
 2019-11-17 10:37:10 +01:00
Kai Bao 383748b161 some cleaning up for the AquiferFetkovich 2019-11-17 10:37:10 +01:00
Kai Bao 21d69a7af0 making dp is Eval for AquiferFetkovich 2019-11-17 10:37:10 +01:00