OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,128 Commits 9 Branches 35 Tags
master
Commit Graph
70 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve 1b13f44e12 Handle WEFAC 
Added test combining WEFAC and GEFAC
 2017-11-30 13:45:05 +01:00
Tor Harald Sandve 19796e2ddc Fix pvtIndex map for cases with non-active eqlnum regions. 2017-11-27 13:40:09 +01:00
Tor Harald Sandve 729d6cf30e Adress PR review issues 2 2017-11-24 10:52:57 +01:00
Tor Harald Sandve d1a654f414 Fix 2p bug 2017-11-22 09:24:52 +01:00
Tor Harald Sandve bce19d87dc Adress PR review issues 2017-11-22 08:31:57 +01:00
Tor Harald Sandve 833b019413 Remove the usage of partition_unif_idx() from opm-core 2017-11-21 15:01:52 +01:00
Tor Harald Sandve 3486e98ae3 Cleaning the initialization code 
-remove whitespaces
-fix documentation
 2017-11-21 12:52:07 +01:00
Tor Harald Sandve e613f2b8c5 Use &ref not shared_pointer to MaterialLawManager 2017-11-21 12:08:10 +01:00
Tor Harald Sandve 12108d57ab Remove blackoilPhases and phaseUsage from the initialization code 
Note 1: The initialization code now always consider 3 phases.
For 2-phase cases a trivial (0) state is returned.
Note 2: The initialization code does not compute a BlackoilStats,
but instead pass the initialization object with the initial state.
 2017-11-21 12:08:10 +01:00
Tor Harald Sandve 8def11ff93 Remove BlackoilProps from equil initalization code 
Use FluidSystem and materialLaw from opm-material
directly not via the BlackoilProps in opm-core
 2017-11-21 12:08:10 +01:00
Tor Harald Sandve 75657ff482 Update the swatinit test base on fix in opm-material#248 2017-10-11 09:39:12 +02:00
Tor Harald Sandve 9a306def92 Fix fallout if no group controll (NONE) is specified for a group 2017-08-18 08:56:26 +02:00
Tor Harald Sandve 843e8c9a6f Add interface for passing cell pressures directly in wellState.init(...) 2017-08-03 10:31:10 +02:00
Tor Harald Sandve d935458fca Add polymer to phase usage. 2017-06-16 13:40:29 +02:00
Tor Harald Sandve fc380041f2 Add polymer to blackoilstate 2017-06-12 15:37:57 +02:00
Tor Harald Sandve dbe7930ef7 Add SSOL to blackoilState 
Stores the solvent saturation in the simulator container.
 2017-05-10 11:14:53 +02:00
Tor Harald Sandve daecfa7e55 Add solvent to phaseUsage 2017-05-08 10:29:51 +02:00
Tor Harald Sandve a96c1f9ea0 FIX memory leakage in well_controls 
The Alq and vfp is set free in well_controls_destroy to avoid memory
leakage.
 2017-04-20 12:58:16 +02:00
Tor Harald Sandve a8261b62da Add sat table id to well struct 2017-04-06 13:52:27 +02:00
Tor Harald Sandve e289c8f35b Enable swatinit equil test 2017-03-22 10:26:03 +01:00
Tor Harald Sandve 77b9311f2c FIX swatinit test in test_equil 
The capillarySwatinit.DATA is updated to make it possible to run in Ecl.
Referance solutions is updated accordingly.
 2017-03-22 10:20:59 +01:00
Tor Harald Sandve 7579f2bdb9 Do not extrapolate initial rs and rv values in the depth tables 2017-03-16 12:57:56 +01:00
Tor Harald Sandve 70b6a6e5ef Do not set rs=rsSat and rv=rvSat for the saturated case 2017-02-22 15:57:53 +01:00
Tor Harald Sandve d5e2e5d2e5 Add test for swatinit 2017-01-05 09:09:25 +01:00
Tor Harald Sandve 5ac89ad8a7 Make it optinal to apply SWATINIT 
The reasoning behind this to make it possible to initialize the case
without SWATINIT in order to compute the same defaulted THPRES values as
Ecl. The initialization needs to be re-computed to account for SWATINIT
in the simulations.
 2017-01-02 15:10:09 +01:00
Tor Harald Sandve 2a3a825895 Store whether timestep failed or not 
Used in flow ebos to tell the simulator to recalculate the cached
quantities for failed timesteps.
 2016-12-19 10:52:59 +01:00
Tor Harald Sandve d96b7193ee Make it possible to set initial timestep 
Default is kept at -1.0. I.e. this PR does not change the current
behaviour.
 2016-10-28 09:03:29 +02:00
Tor Harald Sandve f202f2948c Add initalizer for adaptiveTimeStepper that uses values from TUNING 
Some of the tuning values from the TUNING keywords is used to tune the
timestepping.
 2016-09-30 10:36:30 +02:00
Tor Harald Sandve 60da3d9213 Remove Compat.hpp 
Compat.hpp is moved to opm-simulators
 2016-09-27 08:39:26 +02:00
Tor Harald Sandve ff81d48551 Guard against non-existing file 2016-09-21 13:46:31 +02:00
Tor Harald Sandve f1bdd67438 Small fixes hardcodedTimestepControl 
-- avoid using eof()
-- add comments
-- no longer assumes two lines of comments.
-- revert change to default value for timestep.initial_step_length
-- make contructer explicit
-- pass reference
 2016-09-21 09:39:36 +02:00
Tor Harald Sandve 6e9bb4cf0b Timestepper based on userInput 
A new timestepper that reads timesteps from a file generated using
ecl_summary "DECK" TIME
and applies it to the simulator

Also a parameter timestep.initial_step_length (default 1 day) is added
to controll the frist timestep.
 2016-09-21 09:39:36 +02:00
Tor Harald Sandve a1058d45ea use table.size() instead of read from deck. 2016-09-16 10:31:41 +02:00
Tor Harald Sandve da29e292b5 Bugfix: Let NTMISC determine number of MISC tables 
Number of misc tables is given by NTMISC (MISCNUM) and not NTSFUN
(SATNUM)
 2016-09-16 10:31:41 +02:00
Tor Harald Sandve fd049a6962 Fixing some nitpicks 2016-06-24 13:36:05 +02:00
Tor Harald Sandve db03e88090 Fix bug for OIL-GAS case 
- Differentiate between active and canonical phase index
 2016-06-20 11:14:36 +02:00
Tor Harald Sandve bd9c514457 Fix reference pressure for oil-water problem 
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
 2016-06-20 10:36:24 +02:00
Tor Harald Sandve 4db70d1902 Fix two phase EQUIL initialization 2016-06-20 10:36:24 +02:00
Tor Harald Sandve ae9a10942e Fix to handle cases without DISGAS and VAPOIL 
- adds boolean has_disgas and has_vapoil to initHydroCarbonState()
 2016-06-07 08:18:09 +02:00
Tor Harald Sandve 79f04b6c9e Fixing PR comments 
- Use std::vector<HydroCarbonState> instead of std::vector<int>
- Use the initializer list to initialize members in constructors
- Fix indent
- Return OilOnly for cases without gas to avoid potential trouble
further down the line
 2016-05-13 12:49:45 +02:00
Tor Harald Sandve cb4b698b51 Add method for calculating the initial hydroCarbonState 
The following hydroCarbonState are used
    enum HydroCarbonState {
        GasOnly = 0,
        GasAndOil = 1,
        OilOnly = 2
    };
Cells almost filled with water are treated as a GasAndOil state
 2016-05-13 09:10:13 +02:00
Tor Harald Sandve 31133af803 Add member hydroCarbonState to the BlackoilState 
The hydroCarbonState is used to store the hydroCarbonState
  State 1: Gas only
  State 2: Gas and Oil
  State 3: Oil only
An empty vector is return at initialization as
no default values are provided by the blackoilstate.
 2016-05-12 10:32:39 +02:00
Tor Harald Sandve e76b9dd7f1 BUGFIX. Comparison with null pointer 2016-04-15 12:56:04 +02:00
Tor Harald Sandve 972c55ea52 Add COMPDAT to wells_group.data 
Without COMPDAT the wells will be shut and thus not added to the well
collection.
 2016-04-15 08:32:38 +02:00
Tor Harald Sandve acade0bb5f Bugfix in setup guiderates 
- Handle shut wells
- Use the groups control type to determine which phase to calculate
the guide rates from. i.e for a ORAT controlled group, calculate the
guide rates from the oil phase well potentials etc.
 2016-04-12 13:05:56 +02:00
Tor Harald Sandve e1298ff21b Minor fixes based on PR comments 
- fix comments, typos add missing reference arguments.
 2016-04-04 08:10:24 +02:00
Tor Harald Sandve 0fb81945f6 Calculate default guide rates using the well potentials 
The default guide rates are caculated using the well potentials.
The well potentials are calculated in the simulator and given as input
to the wellsManager.
 2016-04-01 15:00:21 +02:00
Tor Harald Sandve b8bad8b26b BUGFIX. Call setupGuideRates before groupcontrol is applied 2016-03-31 09:32:09 +02:00
Tor Harald Sandve 8827ca0794 Bugfix. Fix face direction in the pinchprocessor 2015-12-14 10:48:26 +01:00
Tor Harald Sandve 7689f80a7f Add method to access the materialLawManager 2015-12-11 12:50:54 +01:00
Tor Harald Sandve 43abdf5946 Adapt to changes in the NNC class 2015-12-08 13:03:15 +01:00
Tor Harald Sandve c208d32498 BUGfix. Use correct facedirection 2015-12-08 12:57:43 +01:00
Tor Harald Sandve 7e4bff4a18 Hardcode usage of opmfil 
The opmfil option in the minpv-processor will be used regardless of
OPMFIL input in the deck.
 2015-12-08 11:04:54 +01:00
Tor Harald Sandve 3d7ce4ece2 Cleanup after rebase 
- cleanup of some rebase mess
- Added comments
- Use the maxDp for the NNCs
- remove misplaced break in the pinchprocessor
 2015-12-08 09:50:07 +01:00
Tor Harald Sandve b8f54e4e59 Ignore segments with no active cells above or below. 2015-12-08 09:25:35 +01:00
Tor Harald Sandve 97525de43a Adapt to changed API in the pinch-processor 2015-12-08 09:25:35 +01:00
Tor Harald Sandve a7c1810029 Calculate thresholdPressures for the NNCs 2015-12-08 09:25:35 +01:00
Tor Harald Sandve 97466d988b Fix to account for the combination of minpv and pinch 2015-12-08 09:21:51 +01:00
Tor Harald Sandve dec23df301 Add option for not including the removed volume in the MinpvProcessor 
The volume in cells with pore volume less than the minpv threshold is
removed if minpvMode is ECLStd while it is added to the underlying cell
if minpvMode is OpmFil
 2015-12-08 09:21:51 +01:00
Tor Harald Sandve fd0dbe1d48 Use cell depths based on averaging cell corners 2015-11-24 10:17:12 +01:00
Tor Harald Sandve 7542aca827 Change the number of integration points in the initialization 
The number is changed from 100->2000 to increase accuracy.
 2015-10-30 08:14:10 +01:00
Tor Harald Sandve 8b94e7b0eb Make the code more readable 2015-10-20 16:09:04 +02:00
Tor Harald Sandve 2330cd615a Complete undersaturated PVTG tables by extrapolating from existing data 
This PR copies equivalent code from PvtLiveOil
 2015-10-20 11:29:20 +02:00
Tor Harald Sandve 95df0c5cf6 Set wd.allowCrossFlow directly 2015-10-07 12:50:00 +02:00
Tor Harald Sandve 2303c43c03 Avoid using bool in the c code 2015-10-07 12:49:05 +02:00
Tor Harald Sandve 80cdb6bbf0 Add boolean flag to determine whether crossflow is allowed in a well 
This PR adds allow_cf to the wells structure that determine whether
crossflow is allowed or not. An extra argument is added to addWell(..)
to specify the allow_cf flag.
 2015-10-06 15:54:20 +02:00
Tor Harald Sandve ac32b6302e Use correct units for the accumulated output 
Avoid division on time in the total output of rates.
 2015-09-22 15:49:01 +02:00
Tor Harald Sandve 4251b27737 WARN instead of THROW if completion is not found in the grid 
Completions that are not found in the grid are ignored.
 2015-09-22 13:51:06 +02:00
Tor Harald Sandve 876c8864c7 Use cell thickness from EclipseGrid in well transmissibility 
calculations

The dz calculated in WellDetails::getCubeDim is not correct in cases
where the face centroid of the horizontal faces is located above or
below the face centroid or the vertical faces. The cell thickness in
EclipseGrid, calculated using the Z-coordinates, is therefore used
instead.
 2015-09-15 10:50:56 +02:00
Tor Harald Sandve e1e37c8b8c Merge pull request #1 from bska/totto82-newfluid2 
Correct a few minor issues in PR OPM/opm-core#254
 2013-06-10 06:45:41 -07:00