Commit Graph
4581 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 7e48a7550e Merge pull request #626 from andlaus/better_regex_test
make the regex test more thorough
2014-08-12 12:22:02 +02:00
Atgeirr Flø Rasmussen 95879f2556 Merge pull request #629 from totto82/bug_fix110814
Bug fix #627
2014-08-12 09:43:19 +02:00
Tor Harald Sandve c323345d3b Changes in the ref. solution in the DeakAllDead test 2014-08-12 07:08:57 +02:00
Atgeirr Flø Rasmussen 1d4e672c61 Merge pull request #628 from totto82/constCapPressInit2
Initialization for constant capillary pressure functions
2014-08-11 13:49:37 +02:00
Atgeirr Flø Rasmussen 3f002ab6d8 Merge pull request #627 from osae/update-equil-test
Correcting the equil test.
2014-08-11 13:43:51 +02:00
osae 9b30660d1e Correcting the equil test. 2014-08-11 13:19:17 +02:00
Tor Harald Sandve 28d7380d40 BUGFIX
Wrong placement of parentes
2014-08-11 12:45:52 +02:00
Tor Harald Sandve 5051658a07 Implements initialization for constant capillary pressure functions 2014-08-11 11:23:15 +02:00
Tor Harald Sandve 4f862e759e Computes saturations based on depths
For constant capillar pressure function the saturation is
    determined by cell depths:

    Sg_max, Sw_min
    ----- goc ----
    Sg_min, Sw_min
    ----- woc ----
    Sg_min, Sw_max
2014-08-11 11:22:47 +02:00
Andreas Lauser 29bed1cfb4 make the regex test more thorough
it seems like the std::regex delivered up to gcc 4.8 has problems with
constructs such as ".+". (at least if they appear at the end of a
regex...)
2014-08-08 16:13:30 +02:00
Atgeirr Flø Rasmussen a455f23799 Merge pull request #623 from robertk-iris/dune-3.0-compat
Make code compile with dune trunk version (ie 3.0-git). This should incl...
2014-08-08 10:14:13 +02:00
Atgeirr Flø Rasmussen 9470ab7997 Merge pull request #620 from bska/satfunc-minor-issues
Correct a number of minor issues in capillary pressure scaling code
2014-08-08 10:11:38 +02:00
Bård Skaflestad 6b36dab2ee swatInitScaling(): Abide by OPM coding conventions
This commit attaches the reference-signifying ampersand to the type
as is preferred in the OPM code base.

Suggested by: [at] atgeirr
2014-08-07 18:50:07 +02:00
Bård Skaflestad c047a6c9dc swatInitScaling(): Remove EOL whitespace
This commit removes several instances of EOL whitespace in function
'swatInitScaling()'.  Aesthetic only.  No functional changes.

Suggested by: [at] atgeirr
2014-08-07 18:50:07 +02:00
Bård Skaflestad f8492aeb64 swatInitScaling(): Name magic constant
The constant 1.0e-8 was used as a threshold to distinguish "low"
from "high" capillary pressure values.  Introduce acutual constant
"pc_low_threshold" to clarify that role.

Suggested by: [at] atgeirr
2014-08-07 18:50:07 +02:00
Bård Skaflestad e8901775cd swatInitScaling(): Rename array size parameter
This commit renames the 'np' parameter used to allocate small arrays
for saturations and capillary pressures to 'max_np' to better
reflect its purpose.

Suggested by: [at] atgeirr
2014-08-07 18:50:06 +02:00
Bård Skaflestad 4da2c5862d Initialise saturation points for Pc scaling
This gives predictable failure modes although the actual behaviour
is (probably) unchanged.
2014-08-07 18:50:06 +02:00
Bård Skaflestad 6f75afc62b Consistently refer to BlackoilPhases::Aqua
This avoids confusion.
2014-08-07 18:50:06 +02:00
Bård Skaflestad 62f654b52c Don't use variable-length arrays
We only support up to 'BlackoilPhases::MaxNumPhases' different
phases (and components), so there's no need to pretend otherwise.
2014-08-07 18:50:06 +02:00
Bård Skaflestad 871160b7a0 Merge pull request #624 from atgeirr/default-wellrefdepth
Properly handle defaulted well reference depths.
2014-08-07 18:47:21 +02:00
Joakim Hove 5039d44da6 Merge pull request #619 from andlaus/allow_static_ERT
ERT: link to the pthreads library
2014-08-07 13:25:34 +02:00
Atgeirr Flø Rasmussen f32198a040 Properly handle defaulted well reference depths. 2014-08-07 12:57:05 +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
Bård Skaflestad 115914119b Merge pull request #621 from andlaus/support_dune_alugrid
add support for the new DUNE-ALUGrid module
2014-07-30 14:20:10 +02:00
Andreas Lauser c178ec365b ewoms: make it possible to use the dune-alugrid module instead of the ALUGrid manager in dune-grid 2014-07-30 12:53:17 +02:00
Andreas Lauser 713478d96d add support for the new DUNE-ALUGrid module
this is basically the dune-grid grid manager for ALUGrid properly
out-sourced into an own module. (it does not require an external
library anymore, so it simplifies the build quite a bit.) Also, the
DUNE-ALUGrid module has quite a few new features and performance
improvements compared to the old code from dune-grid. For details, see

http://users.dune-project.org/projects/dune-alugrid
2014-07-30 12:49:18 +02:00
Andreas Lauser d624e9c9ec ERT: link to the threads library of the OS
this is required to make the opm-core build succeed if ERT was build
with -DBUILD_SHARED_LIBS=OFF . (without it, I get errors like

    /home/and/src/ert/devel/libert_util/src/thread_pool_posix.c:328: error: undefined reference to 'pthread_create'
2014-07-26 15:30:47 +02:00
Joakim Hove 662db75f3e Merge pull request #560 from andlaus/EclipseWriter_remove_EclipseHandle
Eclipse writer remove eclipse handle
2014-07-18 11:51:41 +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 597735b7d0 output the cells which the simulator classes consider active
copying the EclipseGrid object is required as the final set of active
cells requires knowledge of the grid used by the simulator which is
not available in opm-parser. In turn, this requires to call
EclipseGrid::resetACTNUM() which is non-const.
2014-07-17 21:47:11 +02:00
Andreas Lauser f1cf2549a9 Merge pull request #375 from akva2/fix_ert
this makes the build system more bullet proof. thanks
2014-07-16 16:31:46 +02:00
Andreas Lauser dc5fc64e98 EclipseWriter: pass an EclipseState to it and use it where possible 2014-07-16 14:34:24 +02:00
Arne Morten Kvarving 6c694141d2 fixed: ERT depends on libdl
this issue was triggered with static libs for ERT
2014-07-16 13:13:49 +02:00
Andreas Lauser 65a1bd6722 EclipseWriter: Use opm-parser's Opm::EclipseGrid class to write the EGRID file
this simplifies things quite a bit and allows us to get rid of the
Opm::EclipseWriterDetails::Grid class...
2014-07-16 12:35:31 +02:00
Andreas Lauser d8e9b5be21 EclipseWriter: add unit test 2014-07-16 10:41:25 +02:00
Andreas Lauser bbd05ec67f EclipseWriter: some minor white space changes 2014-07-16 10:41:25 +02:00
Andreas Lauser c6d3994722 EclipseWriter: make it not crash if no wells are present 2014-07-16 10:41:25 +02:00
Andreas Lauser 89cbfac621 EclipseWriter: Store the Cartesian sizes internally
because it this array can be deleted after calling the
constructor. TODO (?): Do the same for the compressed-to-Cartesian
cell index map.
2014-07-16 10:41:25 +02:00
Andreas Lauser 1a1920e5a4 EclipseWriter: remove some unused functions and refactor the code for Cartesian sizes 2014-07-16 10:41:25 +02:00
Andreas Lauser 8579a971da EclipseWriter: get rid of the EclipseHandle monster
instead, the wrapper classes now call ERT directly, so it's easy to
see what a given class does. interestingly the amount of additional
code required is neglectible (or even negative).
2014-07-16 10:41:25 +02:00
Andreas Lauser 044244c4b0 EclipseWriter: rename some variables and functions to make the naming scheme consistent 2014-07-16 10:41:25 +02:00
Andreas Lauser 750af9bf73 EclipseWriter: avoid "using namespace Foo" in compile-unit scope 2014-07-16 10:41:25 +02:00
Andreas Lauser 26dbfb78c2 EclipseWriter: Remove the non-ERT codepaths
ERT has been a requirement for opm-parser for a while now and
opm-parser is a prerequisite of opm-core, so ERT is always
available. Thus remove the stub code to avoid bitrot...
2014-07-16 10:41:25 +02:00
Andreas Lauser 47a6aac24f Build system: mark ERT as REQUIRED
de facto, this does not change anything because opm-parser is required
and it has a hard dependency on ERT. It is good style to declare all
prerequisites explicitly in each module, though. Thanks to [at]bska
for the catch.
2014-07-16 10:41:24 +02:00
Andreas Lauser e142094443 remove the "Eclipse" prefix from all classes in namespace "EclipseWriterDetails"
this have become become superfluous by the namespace...
2014-07-14 13:58:53 +02:00
Andreas Lauser d71c2a0fa6 EclipseWriter: introduce namespace EclipseWriterDetails
it is for -- well -- the implementation details of EclipseWriter...
2014-07-14 13:58:53 +02:00
Andreas Lauser 15ff31f307 EclipseWriter: stop making UnstructuredGrid think it is special
instead, the same interface as for Dune::CpGrid is now
used. (i.e. pass all relevant information as separate arguments.)
2014-07-14 13:58:50 +02:00
Andreas Lauser 6ac1196859 EclipseWriter: use opm-parser's EclipseGrid class
this unifies the grid creation code paths with the one used by the
simulators and simplfies things.
2014-07-14 13:58:35 +02:00
Alf Birger Rustad 3511812a52 Merge pull request #617 from bska/disable-equil-test
Disable "test_equil" test
2014-07-09 10:12:52 +02:00
Bård Skaflestad 427e53b69b Disable "test_equil" test
This test breaks the Continuous Integration system (Jenkins).  While
we investigate the underlying causes it is better to restore the
build to pristine order.
2014-07-08 22:30:49 +02:00