osae
c1732b0b32
Make use of EclipseState for EQLNUM and SWATINIT.
2014-06-26 14:46:57 +02:00
Andreas Lauser
f21ed76851
rename "(Volume|Flux)Variables" to "(In|Ex)tensiveQuantities"
...
"intensive" means that the value of these quantities at a given
spatial location does not depend on any value of the neighboring
intensive quantities. In contrast, "extensive" quantities depend in
the intensive quantities of the environment of the spatial location.
this change is necessary is because the previous nomenclature was very
specific to finite volume discretizations, but the models themselves
were already rather generic. (i.e., "volume variables" are the
intensive quantities of finite volume methods and "flux variables"
are the extensive ones.)
2014-06-24 18:24:09 +02:00
Andreas Lauser
05775a0b36
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
0219f83563
glue in support for property modifiers
...
i.e. reading the grid properties from EclipseState instead of from the
raw deck. This requires that all deck files exhibit a GRID and a
SCHEDULE section or else EclipseState will throw in the constructor.
2014-06-09 12:36:46 +02:00
Andreas Lauser
4f5e3a448e
ECL problem: Use Opm::EclipseState instead of the raw deck where possible
...
this means that property modifiers are now automatically supported...
2014-06-04 18:05:12 +02:00
Andreas Lauser
21719a6860
fix the equilibration test by using new values
...
thanks to @bska for the hints.
2014-06-04 13:26:37 +02:00
Andreas Lauser
d1a8c9d787
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
9a7b068d15
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
12b1c257d6
ECL problem: fix the episode handling
...
now the episodes seem to match the report steps...
2014-05-30 13:53:36 +02:00
Andreas Lauser
6a50afb219
rename all "newParserDeck" objects to "deck"
...
The "new" parser is now "the" parser...
2014-05-21 11:22:43 +02:00
Andreas Lauser
f360562aee
remove EclipseGridParser compatibility methods from all classes
2014-05-21 11:22:43 +02:00
Liu Ming
559003ef1e
Test Petsc.
2014-05-16 14:55:23 +08:00
Andreas Lauser
d3d3e05d3a
rename the tests/grids folder to tests/data
...
... since the "grids" in that folder are slowly accumulating
information. (e.g. the ART grid for the fracture mapper and ECLIPSE
decks in the future.)
2014-05-08 15:31:32 +02:00
Andreas Lauser
bc7c2f8640
add parameter to also write the "mini steps" instead of just the "report steps"
2014-05-02 16:08:22 +02:00
Andreas Lauser
b7f3ee7b79
rename "newParserDeck" to "deck"
2014-05-02 15:48:04 +02:00
Andreas Lauser
dbb19403fc
completely remove the EclipseGridParser from the module
2014-05-02 15:47:52 +02:00
Andreas Lauser
553698a933
remove tests/integration_tests/sim_fibo_ad_test.cpp
...
this test seems to compare the old and the new parser which does not
make sense anymore once the old parser is no longer available...
2014-05-02 13:59:25 +02:00
Andreas Lauser
83705279bb
add the TABDIMS keyword to the data file for the fluid unit test
...
that's necessary because the Eclipse RM references it in the table
keywords and the opm-parser needs the keyword to be present to use
it...
2014-04-30 16:49:29 +02:00
Andreas Lauser
1e81039b1b
ECL problem: use the default material law for Eclipse and read the data from the deck
...
TODO: material laws other than the default one...
2014-04-28 19:12:53 +02:00
Andreas Lauser
84b5a6da63
ECL problem: set the start time to the one specified in the deck
2014-04-27 19:12:32 +02:00
Andreas Lauser
45758d723c
ECL problem: return the stem of the name of the deck file in the name() method
...
this causes output files to have the expected names, e.g. "SPE9" or
"NORNE" instead of "ECL"...
2014-04-27 19:12:32 +02:00
Andreas Lauser
0bb56e770f
make the name() method of problems non-static again
...
this allows to easily specify the problem name at runtime.
2014-04-27 19:12:32 +02:00
Andreas Lauser
515f9b00cf
add a simulator which uses Eclipse data files and the blackoil model
2014-04-27 19:12:32 +02:00
Andreas Lauser
112e96d7e6
convert the examples and the tests to opm-parser
2014-04-25 14:25:54 +02:00
Joakim Hove
feeaeb1d2e
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
Bård Skaflestad
29ae3ab836
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
305e9d1448
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
b225970686
Add (all-zero) initialisation of new EquilRecord fields.
2014-04-15 13:41:10 +02:00
Bård Skaflestad
333e110d4f
Merge pull request #538 from blattms/parallel-solver-support
...
Added support for parallel dune-istl solvers
2014-04-08 00:17:35 +02:00
Markus Blatt
f67ed5d334
Fix matrix size and symmetry for parallel runs.
2014-04-04 21:01:32 +02:00
Markus Blatt
7fd5b65691
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
a43ae52c18
Some additional tests: live gas, RSVD and RVVD
2014-04-03 09:07:00 +02:00
osae
054e7b42b8
Update tests and provide some eclipse output.
2014-03-31 15:32:06 +02:00
Kai Bao
5dd0434707
Added the test code and test data.
...
Added TESTTIMER.DATA and test_timer.cpp
2014-03-26 17:53:06 +01:00
osae
5d028d4eca
Merge branch 'master' of git://github.com/OPM/opm-core
...
Conflicts:
CMakeLists_files.cmake
2014-03-26 14:51:06 +01:00
Atgeirr Flø Rasmussen
347016a066
Add more checks to cover bug that was in operator -=.
2014-03-26 12:25:11 +01:00
Atgeirr Flø Rasmussen
60ff38adc6
Added test for += and -= operators.
2014-03-26 12:03:44 +01:00
Atgeirr Flø Rasmussen
37a23825c4
Removed dead code in test_block.cpp.
2014-03-26 11:48:13 +01:00
Joakim Hove
f0126b2501
Removed WellsManager constructor which takes an ole Eclipsegridparser instance.
2014-03-25 18:57:58 +01:00
Atgeirr Flø Rasmussen
5a9786aa32
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
2eab8aeb38
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
b8959c45dd
Increase verbosity such that we see the actual solve
2014-03-20 22:24:33 +01:00
Markus Blatt
eda0be1b8c
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
8d9cd23722
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
bdc4573e2a
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
Atgeirr Flø Rasmussen
fd4f5f5a26
Merge branch 'master' into new_well_formulation
...
Conflicts:
opm/autodiff/FullyImplicitBlackoilSolver.cpp
To resolve conflicts, WellState was changed to WellStateFullyImplicitBlackoil
in multiple places, and perfRate() changed to perfPhaseRate() in
WellDensitySegmented.
2014-03-20 10:04:45 +01:00
Markus Blatt
2f3c17bd9d
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
8be1f0e8d3
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
c2b647d245
Add test data file for compute_initial_state.cpp.
2014-02-27 15:55:08 +01:00
Atgeirr Flø Rasmussen
d13bf03e1f
Bugfix in RsSatAtContact: use min(), not max().
...
Also modified test to match output.
2014-02-27 14:57:38 +01:00