Atgeirr Flø Rasmussen
1c9675605c
Fix bug in RS initialisation.
...
Also throw if default init is specified and datum != goc depth.
2014-02-27 14:48:14 +01:00
Atgeirr Flø Rasmussen
a7c45d4e9f
Rename PhasePressureSaturationComputer -> InitialStateComputer.
...
Also add (unused so far) rs_ field to class.
2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen
91ae9df907
Add test for live oil initialisation.
...
The test is not finished or verified yet.
2014-02-27 08:31:51 +01:00
Atgeirr Flø Rasmussen
38c89f363d
Made phase mixing functors a class hierarchy.
...
In summary:
- added RsFunction (base class),
- made NoMixing, RsVD, RsSatAtContact inherit RsFunction,
- RS and RV are no longer template arguments for EquilReg class,
- EquilReg constructor now takes two shared_ptr<Miscibility::RsFunction>,
- use of constructor updated, mostly using make_shared.
2014-02-26 14:47:24 +01:00
Atgeirr Flø Rasmussen
64b6a40191
Capitalize nested namespace names.
...
equil -> Equil
miscibility -> Miscibility
2014-02-24 15:55:14 +01:00
Atgeirr Flø Rasmussen
2b0fcfe748
Move RegionMapping class to its own header, add test.
...
Class now resides in opm/core/utility/RegionMapping.hpp.
2014-02-24 15:19:04 +01:00
Atgeirr Flø Rasmussen
83d0487097
Add test case with overlapping transitions.
...
Capillary pressure functions and contact depths
have been modified to ensure a large overlap.
2014-02-21 14:50:45 +01:00
Atgeirr Flø Rasmussen
7d63cb9204
Add test case with capillary transition region.
2014-02-21 08:55:15 +01:00
Atgeirr Flø Rasmussen
b2be489e6e
Add saturation computation to and rename computer class.
...
Opm::equil::DeckDependent::PhasePressureComputer ->
Opm::equil::DeckDependent::PhasePressureSaturationComputer
2014-02-21 08:52:25 +01:00
Atgeirr Flø Rasmussen
dc6bcead91
Add test case for capillary inversion.
2014-02-21 08:32:15 +01:00
Atgeirr Flø Rasmussen
4ec65f2f8f
Add another test deck for initialisation.
...
This deck includes capillary functions.
2014-02-20 15:39:15 +01:00
Atgeirr Flø Rasmussen
ebb6eaf742
Complete pressure test for dead-oil deck.
2014-02-19 13:41:20 +01:00
Atgeirr Flø Rasmussen
2ebaef62a0
Modify test data.
2014-02-19 13:40:02 +01:00
Kristian Flikka
ab42682399
Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing
2014-02-14 15:36:32 +01:00
Kristian Flikka
3c93c7a781
Added building of WellsCollection group structure from new opm-parser objects
2014-02-14 13:43:25 +01:00
Kristian Flikka
d7568b4adf
Changed the WellCollection addChild functions to be more specific, and strict
2014-02-13 16:00:39 +01:00
Kristian Flikka
1181d1c1bc
Create WellsGroupInterface from opm-parser Well/Group objects
2014-02-12 15:39:57 +01:00
Kristian Flikka
7ba6431209
Fixed copyright section
2014-02-11 14:21:15 +01:00
Kristian Flikka
b6072e5112
Added support for creation of WellsGroup objects from new parser Well and Group objects
2014-02-11 14:12:36 +01:00
Kristian Flikka
aa329b8b3e
Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses
2014-02-06 16:31:35 +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
Atgeirr Flø Rasmussen
b134fe048a
Still working on test_equil.cpp.
2014-02-05 11:26:29 +01:00
Joakim Hove
ca2def2a02
Merged upstream/master
2014-02-04 21:42:07 +01:00
Atgeirr Flø Rasmussen
04eea929ba
Fix contact depths in test deck.
2014-02-04 10:57:23 +01:00
Atgeirr Flø Rasmussen
634b78a9d9
Created simple data for init testing.
2014-02-04 09:38:47 +01:00
Atgeirr Flø Rasmussen
85be4b1263
Add (unfinished) test case.
2014-02-03 15:36:20 +01:00
Atgeirr Flø Rasmussen
0061b25408
Merge remote-tracking branch 'bska/initialisation' into initialisation
2014-01-31 15:41:58 +01:00
Bård Skaflestad
0fc3571488
Fix fallout from PR #474
...
The check introduced in PR #474 (commit ad899fc) means all decks
must supply valid depth data. Update test decks accordingly to
restore "make test".
2014-01-31 14:24:02 +01:00
Joakim Hove
3e2df33a65
Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates
...
Conflicts:
opm/core/wells/WellsManager.cpp
2014-01-30 09:50:09 +01:00
Joakim Hove
0138fc43ef
Merged upstream/master
2014-01-29 15:25:21 +01:00
Kristian Flikka
fbe2f31653
Updated COMPDAT i,j,k indices, and removed the old commented part
2014-01-29 11:58:14 +01:00
Kristian Flikka
0d492ce407
Changed data file not not have same perforation multiple times, as the old system doesn't support this
2014-01-29 11:58:13 +01:00
Kristian Flikka
7ce9cb9055
Compdat extraction from new CompletionXXX classes
2014-01-29 11:58:13 +01:00
Kristian Flikka
74c3040c43
Added an extra data file with an extra well
2014-01-29 11:58:13 +01:00
Joakim Hove
9f948329c4
Merge remote-tracking branch 'upstream/master' into opm-parser-integrate
2014-01-29 11:02:21 +01:00
Joakim Hove
1548984acd
Merge remote-tracking branch 'upstream/master' into wellsmanager-rates
2014-01-29 11:01:14 +01:00
Atgeirr Flø Rasmussen
d5ebe3c685
Use correct number of items in initialiser.
2014-01-27 10:42:35 +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
a4b2044e14
Modified test case to match MRST test case.
2014-01-23 12:42:17 +01:00
Kristian Flikka
3b0a9067b4
Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor
2014-01-22 15:22:32 +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
Bård Skaflestad
76844c9c59
Include <numeric> for std::iota()
...
Header was missing in earlier revision.
2014-01-21 17:54:47 +01:00
Bård Skaflestad
6814b97698
Add reverse look-up mapping for region vectors
...
Class RegionMapping<> provides an easy way of extracting the cells
that belong to any identified region (e.g., as defined by EQLNUM) of
the deck.
2014-01-21 17:54:47 +01:00
Bård Skaflestad
4114da26bd
Test cell subset phase pressure assignment.
2014-01-21 17:54:46 +01:00
Bård Skaflestad
c582d00fb6
Compute phase pressures in subset of cells
...
This commit adds support for assigning the initial phase pressure
distribution to a subset of the total grid cells. This is needed in
order to fully support equilibration regions. The existing region
support (template parameter 'Region' in function 'phasePressures()')
was only used/needed to define PVT property (specifically, the fluid
phase density) calculator pertaining to a particular equilibration
region.
2014-01-21 17:54:46 +01:00
