OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,755 Commits 9 Branches 35 Tags 15 MiB
75749c3dab
Commit Graph

4755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bård Skaflestad
98523baca5 Merge pull request #616 from andlaus/test_for_extended_std__regex 
use extended regular expressions in the test for std::regex
 2014-07-08 13:40:11 +02:00
Andreas Lauser
dabe50d77d use extended regular expressions in the test for std::regex 
for some compilers (e.g., GCC < 4.9) the default is buggy and
opm-parser thus uses extended expressions...

thanks to [at]bska for digging this up!
 2014-07-08 13:24:34 +02:00
Bård Skaflestad
8e4b9e1f6a Merge pull request #615 from andlaus/use_std__regex_if_available 
FindCXX11Features: check for a usable std::regex
 2014-07-07 23:02:22 +02:00
Andreas Lauser
c764c89da9 FindCXX11Features: check for a usable std::regex 
and add a config.h variable in the opm-parser test.
 2014-07-07 17:41:19 +02:00
Atgeirr Flø Rasmussen
6947423b97 Merge pull request #613 from andlaus/PvtLiveOil_fix_argument_ordering 
PvtLiveOil: fix ordering of arguments
 2014-07-07 14:23:54 +02:00
Atgeirr Flø Rasmussen
0ff5fff701 Merge pull request #611 from andlaus/update_ewoms_prereqs 
Find-ewoms.cmake: update prerequisites
 2014-07-07 14:12:23 +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
Andreas Lauser
db3a616a2f PvtLiveOil: fix ordering of arguments 
the strange thing is that this worked as-is. The only explaination
which I have for this is that these code paths are unused...
 2014-07-07 11:58:54 +02:00
Atgeirr Flø Rasmussen
ec205ace37 Merge pull request #612 from bska/resv-support 
Implement deep copy operation for struct WellControls
 2014-07-04 16:09:13 +02:00
Bård Skaflestad
24524e0137 Reimplement clone_wells() in terms of well_controls_clone() 2014-07-03 16:09:56 +02:00
Bård Skaflestad
841192c605 wells.h: Document several function 
This commit adds Doxygen-style documentation to functions

  - clear_well_controls()
  - set_current_control()
  - wells_equal()

No functional changes.
 2014-07-03 16:09:56 +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
Bård Skaflestad
001834ccab clone_wells(): Assert result equal to input 
This adds a debug-mode safety belt that cloning wells produces a
comparable set of wells to the input.
 2014-07-03 16:09:56 +02:00
Bård Skaflestad
7f5ee5abf3 well_controls_equal(): Don't compare set capacities 
The 'cpty' field is for internal memory management purposes only.
No client can know of its existence, let alone inspect or directly
change the value, so it should not be used to adjudicate control set
equality.  This was useful during the refactoring work to introduce
the opm-parser support, but its utility has since ceased.

Okay'ed by: [at] atgeirr and [at] joakim-hove
 2014-07-03 16:09:56 +02:00
Atgeirr Flø Rasmussen
81c47c07db Merge pull request #605 from atgeirr/fix_mdu 
Fixes for tof and tracer solvers
 2014-07-03 16:03:40 +02:00
Andreas Lauser
15b53895e5 Find-ewoms.cmake: update prerequisites 2014-07-02 16:49:07 +02:00
Andreas Lauser
d2cd2509eb Merge pull request #608 from andlaus/Findopm-parser_require_boost__regex 
add the boost::regex library as a prerequisite
 2014-06-30 14:43:14 +02:00
Andreas Lauser
5e369ac31e add the boost::regex library as a prerequisite 
this is required for regex-matching keywords. Once GCC 4.9 is the
minimum compiler version to be supported, this can be dropped in favor
of std::regex ...
 2014-06-29 14:40:30 +02:00
osae
80463a2e40 Included inititalisation of surface volumes. 2014-06-26 15:06:47 +02:00
osae
89137e8cd0 Make use of EclipseState for EQLNUM and SWATINIT. 2014-06-26 14:46:57 +02:00
osae
e3b06569e9 Adjustments for vanishing oil phase. 2014-06-25 18:03:17 +02:00
osae
d3ee5dc20a SWATINIT: Initialisation and capillary pressure scaling. 2014-06-25 18:03:17 +02:00
osae
6e00befef6 Scaling of capillary pressure. 2014-06-25 18:03:17 +02:00
Atgeirr Flø Rasmussen
e8db63dfb0 Fix initialization of tracer heads, and output ordering. 2014-06-25 09:56:37 +02:00
Atgeirr Flø Rasmussen
59d0ae185f Refactor tracer computations. 
Current version executes reordered solve once for each tracer. The benefit
is a simpler code and the ability to use MDU with tracers. The cost is
potentially higher runtime, compared to doing a single sweep for all
tracers (and tof).
 2014-06-24 09:43:26 +02:00
Atgeirr Flø Rasmussen
11bea99bef Remove unused data member. 2014-06-23 14:18:01 +02:00