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
Bård Skaflestad
4c39a8a595
Add basic equilibration facility
...
This commit adds a simple facility for calculating initial phase
pressures assuming stationary conditions, a known reference pressure
in the oil zone as well as the depth and capillary pressures at the
water-oil and gas-oil contacts.
Function 'Opm::equil::phasePressures()' uses a simple ODE/IVP-based
approach, solved using the traditional RK4 method with constant step
sizes, to derive the required pressure values. Specifically, we
solve the ODE
dp/dz = rho(z,p) * g
with 'z' represening depth, 'p' being a phase pressure and 'rho' the
associate phase density. Finally, 'g' is the acceleration of
gravity. We assume that we can calculate phase densities, e.g.,
from table look-up. This assumption holds in the case of an ECLIPSE
input deck.
Using RK4 with constant step sizes is a limitation of this
implementation. This, basically, assumes that the phase densities
varies only smoothly with depth and pressure (at reservoir
conditions).
2014-01-21 17:54:46 +01: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
d5b47295e3
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
Kristian Flikka
731fe7d3f4
Changed new WellsManager constructor to take in EclipseStateConstPtr instead of SchedulePtr
2014-01-08 16:10:55 +01:00
Kristian Flikka
1f1c0ebcf3
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
41b7af408b
Merge from joakim/wellmanager
2014-01-07 16:09:35 +01:00
Joakim Hove
8132954b85
Added functions to get type, target and distr of *current* control.
2014-01-06 14:40:03 +01:00
Joakim Hove
6098368d08
Added new function well_controls_iset_distr().
2014-01-06 12:22:15 +01:00
Joakim Hove
bf95c9f768
Added new functions to set target and type and invert value of current control.
2014-01-06 12:06:36 +01:00
Joakim Hove
8819f7f42c
Changes test_wells to use well_controls_get_xxx() functions.
2014-01-06 10:34:25 +01:00
Joakim Hove
efcb1103d1
Changed test_wellsmanager to use well_controls_get_xxx() functions.
2014-01-06 10:26:46 +01:00
Joakim Hove
17b800796f
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
fb8413960c
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
ec71334d74
Added test calls to wells_equal() and well_controls_equal().
2014-01-03 16:01:15 +01:00
Joakim Hove
487ff810fd
Added test_wellmanager which loads wellmanager from deck and tests many values.
2014-01-03 16:00:57 +01:00
Kristian Flikka
e4a7a33598
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
Kristian Flikka
dba421316a
Fixed sim_fibo_ad, by adding EclipseWriter
2013-12-05 13:38:40 +01:00
Kristian Flikka
35ce8d2932
Removed some debug code
2013-11-27 13:32:12 +01:00
Kristian Flikka
31b03a2572
Added new parser classes, simple step 1, loop through TSTEPS in Schedule
2013-11-27 13:32:12 +01:00
Kristian Flikka
031584aa81
Minor change to argument vector, to be according to the main() standard
2013-11-27 13:31:48 +01:00
Kristian Flikka
2de09d6d56
Removed use of deprecated boost native string func, replaced with string()
2013-11-27 09:10:54 +01:00
Kristian Flikka
5a2765a296
Updated test to match changed constructor of SimulatorFullyImplicitBlackoil
2013-11-26 15:16:21 +01:00
Kristian Flikka
3f68cbfe1b
Fixed some rotten pointer/alloc code. Updated data paths
2013-11-26 14:46:07 +01:00
Kristian Flikka
111c9ee445
Added sim_fibo_ad_test, running two identical simulations with the SPE1 case
2013-11-26 12:55:41 +01:00
Joakim Hove
1829acd201
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
Kristian Flikka
3f970244de
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
5798b5f9f1
Added test with accompanying data for Blackoilstate::equals()
2013-10-28 17:43:29 +01:00
Arne Morten Kvarving
278ad83e7f
loosen tolerance a bit to avoid failing tests on certain archs (i386, precise)
2013-10-23 09:41:26 +02:00
Arne Morten Kvarving
e8386a32c1
changed: run test for a x different than pi
...
this to workaround roundoff differences occuring near sin(pi) on
different compilers/hardware
2013-10-16 11:35:47 +02:00
Atgeirr Flø Rasmussen
85f79c0e84
Rename AutoDiff::ForwardBlock -> Opm::AutoDiffBlock.
...
Also moved AutoDiffHelpers.hpp content to Opm namespace, and modified other
files as required by these two changes.
2013-09-19 12:53:28 +02:00
Atgeirr Flø Rasmussen
e9b933bf4f
Rename AutoDiff::Forward -> Opm::AutoDiff.
2013-09-19 11:32:47 +02:00
Andreas Lauser
0582ef08d8
explicitly include <iostream>
...
instead of relying on relying that some header includes it...
2013-09-05 12:28:16 +02:00
Andreas Lauser
51cb4f2cb8
Add exception handlers to all tutorials and examples
2013-09-05 12:28:04 +02:00
Andreas Lauser
5cd622fbf7
use std::shared_ptr instead of boost::shared_ptr
...
our policy is that we only use boost if necessary, i.e., if the oldest
supported compiler does not support a given feature but boost
does. since we recently switched to GCC 4.4 or newer, std::shared_ptr
is available unconditionally.
2013-08-08 13:25:58 +02:00
Jens Olav Nygaard
d3a02e4891
Added ForwardBlock operator* for scalars.
2013-08-02 12:24:12 +02:00
Jens Olav Nygaard
23e2034118
Testing workflow with upstream + local repo.
...
Added template for unit test for new feature.
Updated (CMake's) list of unit tests.
2013-08-01 15:43:21 +02:00
Roland Kaufmann
814130f010
Provide way of shadowing only some properties
...
The current implementations of IncompPropertiesInterface are very
all-or-nothing. In some situations, you want to read rock and fluid
properties from an Eclipse file, but use analytical functions for
the unsaturated properties. Or you want to update properties based
on a marching filter.
This patch provides a way to mix various property objects, or to
"shadow" the properties with a raw array of data, so you don't have
to reimplement the entire interface just to make a small change.
2013-07-30 13:11:52 +02:00
Bård Skaflestad
a1b0a0af83
Mark deck as FIELD units.
...
The numbers in the deck are more indicative of FIELD unit conventions
than METRIC unit conventions, so allow the input parser to interpret
the data in that manner.
2013-06-05 12:24:23 +02:00
Tor Harald Sandve
d7d80e6225
A test that compares the blackoil fluid based on the [p,r] interface
...
with the blackoil fluid based on the [p,z] interface
2013-06-05 11:21:47 +02:00
Bård Skaflestad
2b57104097
Prefer BOOST_CHECK_EQUAL to BOOST_CHECK
...
The former is more assertive than the latter and provides better
diagnostics. Incidentally, switching to *_EQUAL() also fixes an
assignment that was (probably) intended to be an equality test:
BOOST_CHECK(count = num)
in both test cases.
2013-05-24 21:59:09 +02:00
Atgeirr Flø Rasmussen
937df8869b
Added unit test for Span class.
2013-05-24 16:07:51 +02:00
Atgeirr Flø Rasmussen
f2f83fee32
Remove unused experimental AD class.
2013-05-22 08:39:09 +02:00
Bård Skaflestad
8bc5f66d8d
Promote 'test_impestpfa_ad' to an 'example'
...
This was the original intention, but the file was misplaced during
the module reorganisation.
2013-05-16 09:33:58 +02:00
Bård Skaflestad
e0c85a2fdb
Adapt to CMake-based build system.
...
Specifically,
- #include <config.h> where appropriate (all .cpp files)
- Adjust include statements to account for sub-directory locations
of .hpp files.
2013-05-15 16:10:20 +02:00
Bård Skaflestad
9309024d1e
First partitioning into source/examples/tests
...
Reorganisations are likely.
2013-05-15 10:35:39 +02:00
Atgeirr Flø Rasmussen
2d876925b7
Update to follow previous moves and deletes.
2013-03-18 12:40:34 +01:00
Atgeirr Flø Rasmussen
c78b7de680
Renamed newwells.h -> wells.h.
...
Also moved implementation file to subdir.
2013-03-18 10:33:34 +01:00
Atgeirr Flø Rasmussen
507b756dac
Move GridManager to grid subdir.
...
Also remove GridAdapter (moved to dune-cornerpoint), and
moved grid.c implementation file to grid subdir.
2013-03-18 10:16:46 +01:00
Atgeirr Flø Rasmussen
13f945f081
Added test for DG basis classes.
...
Only 2d so far.
2013-01-17 14:35:50 +01:00
Bård Skaflestad
a92549290f
New function clone_wells()
...
Used to create a deep copy (clone) of an existing Wells object.
While here, add test case for common Wells object operations.
2012-10-04 21:09:47 +02:00
