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

283 Commits

Author SHA1 Message Date
Tor Harald Sandve
c323345d3b Changes in the ref. solution in the DeakAllDead test 2014-08-12 07:08:57 +02:00
osae
9b30660d1e Correcting the equil test. 2014-08-11 13:19:17 +02:00
Robert Kloefkorn
39e0a2b7c4 Make code compile with dune trunk version (ie 3.0-git). This should include support for 
dune 2.3.
 2014-08-06 14:00:54 +02:00
Andreas Lauser
493650d2b1 EclipseWriter: Don't use the deck directly anymore 
instead, use Opm::EclipseState. This requires to pass the PhaseUsage
object to the EclipseWriter, as this one cannot be recovered from
EclipseState (yet?).
 2014-07-18 11:20:28 +02:00
Andreas Lauser
dc5fc64e98 EclipseWriter: pass an EclipseState to it and use it where possible 2014-07-16 14:34:24 +02:00
Andreas Lauser
d8e9b5be21 EclipseWriter: add unit test 2014-07-16 10:41:25 +02:00
Atgeirr Flø Rasmussen
ace1e3306a Merge pull request #607 from osae/swatinit 
Scaling of capillary pressure / initialisation from kw SWATINIT.
 2014-07-07 14:10:02 +02:00
Bård Skaflestad
83b1cc7438 well_controls: Add deep-copy (clone) support 
New function well_controls_clone(), implemented in terms of the
public API only, mirrors the objective of function clone_wells(),
only for well control sets.  Add a basic test to demonstrate the
function too.
 2014-07-03 16:09:56 +02:00
osae
89137e8cd0 Make use of EclipseState for EQLNUM and SWATINIT. 2014-06-26 14:46:57 +02:00
Andreas Lauser
0c47d27827 Glue in support for the grid property modifier keywords 
this basically means using Opm::EclipseState instead of the raw deck
for these keywords.

with this, property modifiers like ADD, MULT, COPY and friends are
supported for at least the PERM* keywords. If additional keywords are
required these can be added relatively easily as well.

no ctest regressions have been observed with this patch on my machine.
 2014-06-11 13:48:49 +02:00
Andreas Lauser
f96dfc2e0f fix the equilibration test by using new values 
thanks to @bska for the hints.
 2014-06-04 13:26:37 +02:00
Andreas Lauser
947d1644bd add missing PVTW keywords to the decks used by the equil test 
the test still fails, but the errors seem to be due to differences in
the saturation functions...
 2014-06-04 11:35:24 +02:00
Andreas Lauser
cbb5910a93 incorperate the review comments/decisions for multi-region PVT 
the largest change is that all classes below opm/core/props/pvt take
the PVT region index as an argument, the higher-level ones (i.e.,
BlackoilProps*) take cell indices.
 2014-06-04 11:11:35 +02:00
Andreas Lauser
fbd8d42e8d Implement multi-region PVT for all property classes 
since they are not using a single PVT table anymore, their "Single"
prefix has been removed...
 2014-06-04 11:11:35 +02:00
Andreas Lauser
f96417e81c rename all "newParserDeck" objects to "deck" 
The "new" parser is now "the" parser...
 2014-05-21 11:22:43 +02:00
Andreas Lauser
3941fbc5f1 remove EclipseGridParser compatibility methods from all classes 2014-05-21 11:22:43 +02:00
Joakim Hove
a9d11675d4 Fixed error in testdata tests/CORNERPOPINT_ACTNUM.DATA 2014-04-29 09:19:07 +02:00
Andreas Lauser
1d7ed18419 convert the examples and the tests to opm-parser 2014-04-25 14:25:54 +02:00
Joakim Hove
0fd91e0c16 Changed the data files used for testing: 
1) Added RUNSPEC section
2) Replaces DEPTHZ keyword with TOPS keyword.
 2014-04-24 15:26:39 +02:00
Joakim Hove
0c9212a605 ERT-601: Added GridManager() constructor which takes a Parser::EclipseGrid instance 2014-04-22 17:16:11 +02:00
Joakim Hove
8260d945fa Added function grid_equal() to compare two UnstructuredGrid instances. 2014-04-22 15:13:54 +02:00
Bård Skaflestad
f9249b1d5d Merge pull request #572 from andlaus/add_tabdims_to_some_decks 
add the missing TABDIMS keyword to the live oil and wet gas unit test data files
 2014-04-16 13:48:56 +02:00
Andreas Lauser
e1cde4f4ab add the missing TABDIMS keyword to the live oil and wet gas unit test data files 
these are required for the new parser. (without them, these files
would be invalid AFAICT, but I'm not an Eclipse file format expert...)
 2014-04-16 11:16:58 +02:00
Atgeirr Flø Rasmussen
ef5a21d710 Add (all-zero) initialisation of new EquilRecord fields. 2014-04-15 13:41:10 +02:00
Bård Skaflestad
f3ebd78296 Merge pull request #538 from blattms/parallel-solver-support 
Added support for parallel dune-istl solvers
 2014-04-08 00:17:35 +02:00
Atgeirr Flø Rasmussen
a47c9c7330 Merge pull request #544 from osae/equil-init 
Equil init
 2014-04-04 22:39:37 +02:00
Markus Blatt
67fffa0951 Fix matrix size and symmetry for parallel runs. 2014-04-04 21:01:32 +02:00
Markus Blatt
3375e313e5 Merge remote-tracking branch 'upstream/master' into parallel-solver-support 
Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp
 2014-04-04 20:38:52 +02:00
osae
04d8322fa0 Some additional tests: live gas, RSVD and RVVD 2014-04-03 09:07:00 +02:00
osae
d0da7a9437 Update tests and provide some eclipse output. 2014-03-31 15:32:06 +02:00
Kai Bao
e5761412ba Added the test code and test data. 
Added TESTTIMER.DATA and test_timer.cpp
 2014-03-26 17:53:06 +01:00
osae
5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core 
Conflicts:
	CMakeLists_files.cmake
 2014-03-26 14:51:06 +01:00
Joakim Hove
20468d1987 Removed WellsManager constructor which takes an ole Eclipsegridparser instance. 2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
86ed298439 Merge pull request #540 from joakim-hove/wellsmanager-well-properties 
Changed the access method to well rates/properties
 2014-03-21 08:58:07 +01:00
Joakim Hove
5eaed335b9 Changed the access to Parser/EclipseState/Schedule to use new well injection and production properties. To be aligned with opm-parser:e75970a28b96374409a55e3e6cea2198b6a0ea23 2014-03-21 00:35:15 +01:00
Markus Blatt
23332dcf8f Increase verbosity such that we see the actual solve 2014-03-20 22:24:33 +01:00
Markus Blatt
621afe3273 Fixes the laplacian. 
As we do not represent dofs on the boundary, we need to make sure that all diagonal
values are 4.
 2014-03-20 22:21:03 +01:00
Markus Blatt
34d246600e Fixed test_linearsolver for the official 2.2 release. 
This release does neither support KAMG nor FastAMG. Therfore
this patch deactivates test these preconditioners.
 2014-03-20 22:18:27 +01:00
Markus Blatt
1e205adcf1 Added support for the parallel solvers of dune-istl. 
To support this the solveSystem methods of the LinearSolverInterface gets
an optional additional template parameter of type boost::any. It can hold any
copy constructable object. In our case it is used to pass the information about
the parallelization into the solvers of dune-istl without the compiler needing to know
their type. Inside of LinearSolverIstl::solveSystem we check whether the type stored inside of
boost::any is the new ParallelIstlInformation. If this is the case we extract the information
and use the parallel solvers if available, otherwise we solve serial/sequential.

The new ParallelIstlInformation is needed as the OwnerOverlapCopyCommunication is not copy
constructable. This is indeed a design flaw that should and will fixed upstream, but for the
time being we need ParallelIstlInformation to transfer the ParallelIndexSet and RemoteIndices
objects.
 2014-03-20 21:59:29 +01:00
Markus Blatt
7281a9567f Added a test for the linear solver interface. 
This test sets up a simple laplace problem and solves it with the available
solvers. It assume that either dune-istl or UMFPack is present, which is
assume to be safe.
 2014-03-19 21:48:07 +01:00
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
Atgeirr Flø Rasmussen
0f852aadc8 Add test data file for compute_initial_state.cpp. 2014-02-27 15:55:08 +01:00
Atgeirr Flø Rasmussen
75a7c5cee8 Bugfix in RsSatAtContact: use min(), not max(). 
Also modified test to match output.
 2014-02-27 14:57:38 +01:00
Atgeirr Flø Rasmussen
3e9b82e083 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
036ab95da2 Rename PhasePressureSaturationComputer -> InitialStateComputer. 
Also add (unused so far) rs_ field to class.
 2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen
7cc0802f3e 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
8ef54b7c64 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
14276f9175 Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2014-02-24 15:55:14 +01:00
Atgeirr Flø Rasmussen
34595ae225 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
2b8deb20fd 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