Commit Graph
4695 Commits
Author SHA1 Message Date
Bård Skaflestad 71596fe8a3 CornerpointChopper::writeGrdecl(): Write fewer items per line
This is in preparation of increasing the vector output precision to
reduce the impact of rounding errors in subsequent upscaling.  The
change impacts floating-point vectors only.

Background: The ECL simulator stipulates an upper bound on the
number of characters in a record (i.e., one line) and while we don't
have such limits, there's no reason to emit lines that can't be
input by other tools.
2014-08-25 14:01:03 +02:00
Bård Skaflestad d3d38d2d6f Merge pull request #634 from osae/satFunc-eclState
Provide eclipse state to saturation property init.
2014-08-25 13:55:44 +02:00
Bård Skaflestad c6c66c58c6 Merge pull request #633 from atgeirr/use-pinch
Unify grid construction, allow PINCH
2014-08-22 20:36:01 +02:00
Atgeirr Flø Rasmussen 393e7af8b2 Use new constructor for EclipseGrid. 2014-08-22 19:54:26 +02:00
osae 96823e04a3 Provide eclipse state to saturation property init. 2014-08-22 15:36:07 +02:00
Atgeirr Flø Rasmussen cfd07600bc Create pointer-to-const objects.
Older gcc (4.4) does not allow conversion of shared_ptr<Foo> to
shared_ptr<const Foo>. Pointed out by @bska.
2014-08-21 15:24:39 +02:00
Atgeirr Flø Rasmussen 5690d20705 Add PINCH support to grid construction. 2014-08-21 14:32:13 +02:00
Atgeirr Flø Rasmussen f72f823aab Make all construction from deck use EclipseGrid.
The deck constructor is still present, but it will construct an
EclipseGrid object instead of doing its own equivalent processing.
2014-08-21 14:21:21 +02:00
Atgeirr Flø Rasmussen 557fa6167c Remove unnecessary grid from fluid test. 2014-08-21 14:18:41 +02:00
Andreas Lauser 38e0800047 FindQuadmath: add -fext-numeric-literals if the compiler supports it
this is required for GCC >= 4.8 to support the 'Q' suffix for floating
point literals (which are used in the quadmath.h header)

In order to prevent compilers which eat the flag but do not support it
from complaining constantly, it is tested for with "-Werror" enabled...
2014-08-18 12:16:04 +02:00
Tor Harald Sandve b331c68fbc Fixes issues pointed out in the PR comments 2014-08-18 08:57:23 +02:00
Tor Harald Sandve 12b245df3d The water/gas pressures are only calculated if woc and goc lies within
the reservoar
The water/gas pressure is set to -inf when woc and goc is above or below
the reservoar.
2014-08-15 08:56:35 +02:00
Atgeirr Flø Rasmussen a6c173abad Merge pull request #625 from andlaus/fix_wells_in_summary_output
EclipseWriter: attempt to fix the well summary output for activeWells != totalWells
2014-08-14 14:02:54 +02:00
Andreas Lauser 6e1bf4b3ab EclipseWriter: attempt to fix the well summary output for activeWells != totalWells
The summary files now always features all wells which ever appear in
the deck in every timestep (even if they are not specified for the
time step). This _should_ fix the crashes when writing Eclipse output
in the Norne deck, but I have no idea if the resulting summary file is
correct. More testing would be thus highly appreciated...
2014-08-14 13:35:44 +02:00
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