OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,188 Commits 9 Branches 35 Tags
f1377d9729eecf7a8aecb0024a8e192fabb9e7a8
Commit Graph

217 Commits

Author SHA1 Message Date
Joakim Hove
ae4738f5e7 Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status 2014-03-04 20:23:19 +01:00
Kristian Flikka
8eaea50e17 Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing 2014-02-14 15:36:32 +01:00
Kristian Flikka
9b6430f907 Added building of WellsCollection group structure from new opm-parser objects 2014-02-14 13:43:25 +01:00
Kristian Flikka
15a7255f30 Changed the WellCollection addChild functions to be more specific, and strict 2014-02-13 16:00:39 +01:00
Kristian Flikka
36348a8f8a Create WellsGroupInterface from opm-parser Well/Group objects 2014-02-12 15:39:57 +01:00
Kristian Flikka
a8136610e0 Fixed copyright section 2014-02-11 14:21:15 +01:00
Kristian Flikka
6a1183dc33 Added support for creation of WellsGroup objects from new parser Well and Group objects 2014-02-11 14:12:36 +01:00
Kristian Flikka
8cdaf7d05d Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses 2014-02-06 16:31:35 +01:00
Joakim Hove
e1f104ccdd Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 23:06:54 +01:00
Atgeirr Flø Rasmussen
6100f1758f Fix variable shadowing warning. 2014-02-05 15:05:26 +01:00
Joakim Hove
6c8cba9d19 Merged upstream/master 2014-02-04 21:42:07 +01:00
Bård Skaflestad
dedbe9272c 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
d176de0075 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
Kristian Flikka
bca4242da9 Updated COMPDAT i,j,k indices, and removed the old commented part 2014-01-29 11:58:14 +01:00
Kristian Flikka
3cdd27c3a9 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
b6afe67357 Compdat extraction from new CompletionXXX classes 2014-01-29 11:58:13 +01:00
Kristian Flikka
9f127099cf Added an extra data file with an extra well 2014-01-29 11:58:13 +01:00
Joakim Hove
bfbc62655d Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-29 11:02:21 +01:00
Joakim Hove
6d79bcda34 Merge remote-tracking branch 'upstream/master' into wellsmanager-rates 2014-01-29 11:01:14 +01:00
Kristian Flikka
6d970ef189 Removes the WELSPECS usage in WellsManager constructor. Step 1 in rewrite of constructor 2014-01-22 15:22:32 +01:00
Kristian Flikka
3c74e4bb9e Merged from upstream/opm-parser-integrate 2014-01-21 13:05:59 +01:00
Joakim Hove
2e64991de8 Renamed Parser->parse() -> Parser->parseFile() to follow opm-parser change. 2014-01-11 08:03:42 +01:00
Tor Harald Sandve
598c7a0cb8 Added pvt functionality for wetgas 
The pvt interface is extended to handle wet-gas systems:
1. rvSat is added as a function in the PVT interface
2. SinglePvtLiveGas computes the pvt values and its derivatives
3. The old rbub variable is changed to rsSat for clearity
4. The new interface is tested in test_blackoilfluid with data from
liveoil.DATA and wetgas.DATA
 2014-01-10 16:07:02 +01:00
Joakim Hove
824c7768de Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 
Conflicts:
	CMakeLists_files.cmake
 2014-01-10 13:04:00 +01:00
Kristian Flikka
bc8ad56db1 Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr 2014-01-08 16:10:55 +01:00
Kristian Flikka
43fd5e23ab New constructor for WellsManager that also takes the new parser as argument. New test comparing old and new 2014-01-07 16:10:45 +01:00
Kristian Flikka
593dcf3cd7 Merge from joakim/wellmanager 2014-01-07 16:09:35 +01:00
Joakim Hove
b346845903 Added functions to get type, target and distr of *current* control. 2014-01-06 14:40:03 +01:00
Joakim Hove
58ba8f45eb Added new function well_controls_iset_distr(). 2014-01-06 12:22:15 +01:00
Joakim Hove
fdf7bdba85 Added new functions to set target and type and invert value of current control. 2014-01-06 12:06:36 +01:00
Joakim Hove
85984a72e4 Changes test_wells to use well_controls_get_xxx() functions. 2014-01-06 10:34:25 +01:00
Joakim Hove
9d9c6a5676 Changed test_wellsmanager to use well_controls_get_xxx() functions. 2014-01-06 10:26:46 +01:00
Joakim Hove
0b37bdd1ec Temporarily added symbol HAVE_WELLCONTROLS before including well_controls.h - to get acces to the internal elements in struct WellControls. 2014-01-05 16:25:31 +01:00
Joakim Hove
35d46225b8 Removed #include <opm/core/well_controls.h> from wells.h and inserted explicit #include <opm/core/well_controls.h> where needed. 2014-01-05 15:03:30 +01:00
Joakim Hove
61ec55403a Added test calls to wells_equal() and well_controls_equal(). 2014-01-03 16:01:15 +01:00
Joakim Hove
35b371dfa9 Added test_wellmanager which loads wellmanager from deck and tests many values. 2014-01-03 16:00:57 +01:00
Kristian Flikka
fd942e347d Implementation (not finished) of wells_equal, well_controls_equal, and tests. To build a WellsManager test for old and new parser 
Conflicts:
	CMakeLists_files.cmake
 2014-01-03 16:00:10 +01:00
Joakim Hove
d0fb8655da Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2013-12-08 18:38:38 +01:00
Bård Skaflestad
9e1e50d159 Switch condition interface to phase presence facility 
Commit a5a4d7b introduced density and viscosity evaluators into the
SinglePvtInterface that accepted an externally assignable condition
to distinguish saturated from unsaturated cases.  As a result of a
few low-level technical problems with that approach, this commit
changes those affected interfaces to use the black-oil specific
'PhasePresence' facility of commit a033329 instead.

Update tests and callers accordingly.

Suggested by: @andlaus
Approved by:  @atgeirr
 2013-12-03 16:12:52 +01:00
Tor Harald Sandve
a5a4d7ba39 Added functions for b and mu with isSaturated as input. 
Functions for volume factor and viscosity that explicitly take a boolean
variable indicating whether the fluid is saturated or not is added to
the SinglePvtInterface.

Corresponding changes are done in the dependent PVT files.

The new functionality is tested in test_blackoilfluid
 2013-11-28 15:56:17 +01:00
Joakim Hove
ce8da88764 Added very simple parser test to check a parser can be instantiated and a simple file parsed 2013-11-14 12:52:12 +01:00
Andreas Lauser
ae901534c3 spline: fix the monotinic_() method and creation of monotonic splines 
also, extend the unit test for it. (*phew* that was much more fun than
appreciated because of all the index shifts. I'm still not 100% sure
that everything works in all corner cases, but at least my confidence
is at 95%.)
 2013-11-07 19:53:31 +01:00
Andreas Lauser
c9067c4bda spline: some fixes to make Spline::intersect() work correctly 
most of these issues are fallout from the conversion of the spline
class from a moments (second derivative) based approach to hermite
base functions:

- the second and third derivatives where incorrect, and the third
  derivative was not available in the public interface.
- The unit test did not check the derivatives
- The coefficients for the monomial basis were off by the factors
  stemming from the derivatives
- The intersectIntervall_() method used std::max() instead of
  std::min() at one place and still added the base offset for the x
  values as indicated by Stoer
 2013-11-07 15:06:59 +01:00
Kristian Flikka
ed8efaefe1 Replaced include math.h with cmath, and changed from fabs to abs. Fixed an error in the testfile, a filename was wrong 2013-11-04 13:51:32 +01:00
Joakim Hove
e7e2f6588b Added test with accompanying data for Blackoilstate::equals() 2013-10-28 17:43:29 +01:00
Roland Kaufmann
f3877facb0 Only use Clang-specific pragma if compiler is Clang 
Otherwise the compiler will probably give us a warning that these
pragmas are unknown. By default that warning is disabled with our
own build system, but we also want to be able to link to our library
without incorporating the entire build system too.
 2013-09-24 11:15:26 +02:00
Atgeirr Flø Rasmussen
d086ee5c63 Merge pull request #344 from andlaus/import_propertysystem 
Import propertysystem
 2013-09-23 04:18:02 -07:00
Roland Kaufmann
cbe232e880 Add missing header include 2013-09-20 10:51:18 +02:00
Andreas Lauser
9733d9c995 add a test for the property system 2013-09-19 20:09:07 +02:00
Atgeirr Flø Rasmussen
86d09115b9 Merge pull request #345 from andlaus/import_splines 
Import splines
 2013-09-19 10:26:02 -07:00