OilfieldToolsNet/opm-simulators
4
0 Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-10-25 23:20:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
649 Commits 31 Branches 117 Tags
2deeeef4e4c0b0d713205ecdb45d58622e21e1f4
Commit Graph
649 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser 2deeeef4e4 really use the new parser 
in the previous commit this was #if 0'ed...
 2014-02-14 17:56:08 +01:00
Andreas Lauser 7f485626a2 use the new parser to read the PVT and grid data from the deck 
the old code has not yet been removed, but in the long term, this is
probably the way to go.
 2014-02-14 17:56:07 +01:00
Andreas Lauser 627b1f3906 make the deck from opm-parser available to the black-oil PVT property classes 2014-02-14 17:56:07 +01:00
Joakim Hove 0a8430690f Merge pull request #82 from flikka/fix-sim_fibo_ad_test 
Trying to get the test back running, by looking at the sim_fib_ad main m...
 2014-02-06 09:07:59 +01:00
Kristian Flikka 269a2bbd24 Reverting some const_casting, that was introduced with no real reason 2014-02-05 21:24:38 +01:00
Kristian Flikka 2b47f0364b Const-ref of parameter to the runWithXParser() functions 2014-02-05 21:18:03 +01:00
Kristian Flikka 5309ba793b Removed comment 2014-02-05 19:46:27 +01:00
Kristian Flikka 79c3a38d24 Changed back arguments of runWithXParser to use ParameterGroup 2014-02-05 19:43:43 +01:00
Kristian Flikka 8d7e7cc731 Trying to get the test back running, by looking at the sim_fib_ad main method. Please advice if the string casting on line 335 is bad stuff, not my strongest side 2014-02-05 18:22:16 +01:00
Joakim Hove 3318f506b3 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-04 21:35:27 +01:00
Bård Skaflestad b43d331119 Merge pull request #81 from blattms/fix-fibs-initialization-order 
Fixes warning about initialization order in FullyImpliciteBlackOilSolver...
 2014-02-03 12:51:11 -08:00
Markus Blatt e05675bd41 Fixes warning about initialization order in FullyImpliciteBlackOilSolver. 2014-02-03 18:14:49 +01:00
Bård Skaflestad 3971862065 Merge pull request #79 from atgeirr/initial-summary-output 
Initial summary output, remove dead code.
 2014-01-31 03:54:49 -08:00
Atgeirr Flø Rasmussen 0de82f3172 Remove more unused code. 2014-01-31 12:29:15 +01:00
Atgeirr Flø Rasmussen 614c3f35af Removed dead code. 
The code was partially kept as a reminder to implement
proper well reporting and mass balance reporting. Now
well reporting has been taken care of, so we remove
the code.
 2014-01-31 09:07:53 +01:00
Atgeirr Flø Rasmussen 436624f662 Write initial values to eclipse format output. 
This yields output files that have the same behaviour as
eclipse in terms of number of steps, and what the steps mean.
 2014-01-30 14:57:58 +01:00
Joakim Hove 0138fc43ef Merged upstream/master 2014-01-29 15:25:21 +01:00
Bård Skaflestad f159aeaa7c Merge pull request #78 from atgeirr/seg-well-model 
Segmented well model
 2014-01-27 06:19:18 -08:00
Atgeirr Flø Rasmussen d5ebe3c685 Use correct number of items in initialiser. 2014-01-27 10:42:35 +01:00
Atgeirr Flø Rasmussen 38a48dd149 Fix indexing error in if-test. 2014-01-27 10:42:17 +01:00
Atgeirr Flø Rasmussen 924080d8dc Proper memorymanagement in test program. 2014-01-27 08:32:24 +01:00
Atgeirr Flø Rasmussen f9ea03fe67 Renamed SegmentedWellModel->WellDensitySegmented. 2014-01-24 15:54:01 +01:00
Atgeirr Flø Rasmussen 2f7697e00d Merge branch 'master' into seg-well-model 2014-01-24 15:48:49 +01:00
Atgeirr Flø Rasmussen 27e616e668 Merge pull request #77 from blattms/fix-debian-eigen 
[cmake,bugfix] Corrects required version and make Eigen3 download work.
 2014-01-24 06:29:45 -08:00
Atgeirr Flø Rasmussen b9e392934f Merge pull request #74 from totto82/wetgas 
Implemention of live gas
 2014-01-24 06:25:47 -08:00
Tor Harald Sandve cdd312fa55 Comment out unused code 
Part of the code that is no longer in use is commented out.
 2014-01-24 13:35:04 +01:00
Tor Harald Sandve 825c9be0db Fixed white spaces 2014-01-24 13:27:32 +01:00
Tor Harald Sandve 19f0a81db1 Fixed from bitwise to logical operator 
The && is used instead of &
 2014-01-24 13:15:29 +01:00
Tor Harald Sandve b2ac4c7aac Fixed missing documentation 2014-01-24 13:14:08 +01:00
Atgeirr Flø Rasmussen 5d386f2a49 Bugfixes in treatment of perforation depths and final accumulation. 2014-01-23 12:42:57 +01:00
Atgeirr Flø Rasmussen a4b2044e14 Modified test case to match MRST test case. 2014-01-23 12:42:17 +01:00
Atgeirr Flø Rasmussen 98371f660f Fix mixture calculation for volatile oil case. 2014-01-23 12:40:54 +01:00
Atgeirr Flø Rasmussen ac6209640b Documented interface for SegmentedWellModel. 2014-01-22 13:55:22 +01:00
Atgeirr Flø Rasmussen aa5d9d255b Added a test program for SegmentedWellModel. 
The only currently tested case is a simple water injector.
 2014-01-22 12:56:08 +01:00
Atgeirr Flø Rasmussen ad81cc6a37 Initial version of segmented well model. 
This computes pressure differences with respect to the bottom-hole pressure
for each well perforation, based on the well flows. It is explicit and not
implicit, using the previous time step's flow rates to calculate the necessary
densities.
 2014-01-22 12:53:05 +01:00
Markus Blatt 35f0f5f5be [cmake,bugfix] Corrects required version and make Eigen3 download work. 
At least on Debian requiring version 3.1 of Eigen3 is not sufficient
according to issue #25 the minimum version is 3.1.2. This patch fixes
the required version. In addition it skips the REQUIRED option passed
to find_package(Eigen3) to make the git download work.

Fixes #25.
 2014-01-15 13:15:13 +01:00
Joakim Hove 37314fd284 Merge pull request #75 from flikka/update-parser-dep 
parse function in libParser renamed, fixed in sim_fibo_ad
 2014-01-13 01:38:10 -08:00
Kristian Flikka b05630c310 parse function in libParser renamed, fixed in sim_fibo_ad 2014-01-13 08:43:39 +01:00
Tor Harald Sandve ed02b4a91f Implementation of live gas 
The simulator now handles live gas as well as live oil.
The primary variables are Po,Sw and Rs,Rv or Sg depending on fluid
condition
State 1 Gas only (Undersaturated gas): Po, Sw and Rv
State 2 Gas and oil: Po, Sw and Sg
State 3 Oil only (Undersaturated oil): Po, Sw and Rs

This commit includes:
1. New interfaces for the vapor oil/gas ratios (Rv)
2. Modifications in the equations to handle rvs
3. New definition of ADI variable to handle changing primary variables
4. Modifications in the solution updates to handle changing primary
variable
5. Some changes in the appleyard process to sync with Mrsts livegas
implementation.

NOTE:
The implementation is tested on the liveoil cases SPE1 and a simplified
SPE9 and produces the same results as the old code.
The simulator is not yet able to converge on SPE3 with livegas present.
For SPE3 to converge a more robust well implementation is needed. The
current simulator reproduce the results of Mrst when a similar well
model is used in Mrst as is currently implemented OPM.
 2014-01-10 16:07:32 +01:00
Tor Harald Sandve 3c5b0b9e73 Add interface for wet gas 
The pvt interface is extened to handle wet gas
1. A function for rvSat is added to the interface
2. An interface that takes rv and the fluid condition as an input for
the gas properties is added. The old interface without rv and the fluid
condition is kept in the file.
3. The new interface is implemented in BlackoilPropsAd and
BlackoilPropsAdFromDeck.

A simulator that tests wet gas is not yet implemented.
 2014-01-10 16:07:32 +01:00
Joakim Hove ed23e017f9 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-10 13:05:20 +01:00
Bård Skaflestad 69b74fb580 Merge pull request #73 from joakim-hove/use_well_controls_api 
Use well controls api
 2014-01-09 03:44:20 -08:00
Joakim Hove bd1417b164 Changed to use well_controls_get_current_distr(). 2014-01-09 12:09:19 +01:00
Joakim Hove 427f55940e Changed direct access to struct WellControls to use well_controls_get_xxx() api. NB: Do check the calls to well_control_iget_distr(). 2014-01-09 09:39:16 +01:00
Joakim Hove 37274035bc Changed direct access to struct WellControls to rather use well_controls_get_xxx() api. 2014-01-09 09:39:08 +01:00
Joakim Hove 4e65151271 Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2013-12-17 11:59:47 +01:00
Joakim Hove 691691b280 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:41:06 +01:00
Atgeirr Flø Rasmussen 671122e2e6 Merge pull request #65 from andlaus/implement_pc 
include capillary pressure in the PDEs
 2013-12-06 02:26:10 -08:00
Andreas Lauser 58afaa5069 fix the rebase fallout 2013-12-06 10:33:58 +01:00
Andreas Lauser 6f2fd5ae69 use the reference pressure to calculate the transmiscibility factors 2013-12-06 10:19:08 +01:00