Commit Graph

938 Commits

Author SHA1 Message Date
Andreas Lauser
e268f8a825 dune-alugrid is optional, not required! 2014-07-30 12:52:49 +02:00
Andreas Lauser
a38c9b357a ewoms: make it possible to use the dune-alugrid module instead of the ALUGrid manager in dune-grid 2014-07-30 12:48:33 +02:00
Andreas Lauser
d8c6d01e92 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:48:33 +02:00
Andreas Lauser
a5565e1c6d Black oil fluid system: add support for decks which only specify gas-saturated oil in PVTO
SPE-9, I'm looking at you!!! (this is probably still different from
what Eclipse does, but it should be more or less okay from the
thermodynamic POV.)
2014-07-29 16:01:11 +02:00
Andreas Lauser
0533c10fa8 Find-ewoms.cmake: update prerequisites 2014-07-25 15:37:57 +02:00
Andreas Lauser
a5da277101 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-25 15:35:19 +02:00
Andreas Lauser
316cf05666 ERT: link to the pthreads library
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-25 15:30:37 +02:00
Andreas Lauser
cc79c93184 black oil fluid system: don't use the numerical value for the surface pressure directly
this is just a minor clean up which does not change anything...
2014-07-25 15:06:15 +02:00
Andreas Lauser
e2f5670a4e black oil fluid system: remove commented out density calculation code
I thought about this a bit and came to the conclusion that since the
composition of oil is already fixed in that context, only the pressure
dependance needs to be included in addition.
2014-07-25 15:06:15 +02:00
Andreas Lauser
9f3010eac3 black oil fluid system: keep the saturation pressure spline consistent
It was not updated if the set PvtoTable was used which then lead to
segfaults.
2014-07-25 15:06:14 +02:00
Arne Morten Kvarving
a3c8632358 fixed: ERT depends on libdl
this issue was triggered with static libs for ERT
2014-07-24 21:08:47 +02:00
Andreas Lauser
35b66fb460 black-oil fluid system: remove debugging artifact
*grr* which idiot forgot this one?
2014-07-24 18:48:38 +02:00
Andreas Lauser
de8b99a161 Black-oil fluid system: do not explicitly include the composition in the tabulated density
It might have to be included, but it made the reservoir test in eWoms
fail...
2014-07-24 14:12:05 +02:00
Andreas Lauser
ec0902c0f3 black oil system: use the UniformXTabulated2DFunction class for the oil formation factor
this means that undersaturated oil is now properly supported.
2014-07-24 14:12:05 +02:00
Andreas Lauser
d408ed8cc8 refactor the 2D tabulation classes
- the StaticTabulated2DFunction class and the base class
  (Tabulated2DFunction) are gone
- the DynamicTabulated2DFunction class has been renamed to
  UniformTabulated2DFunction
- a new class called UniformXTabulated2DFunction has been
  introduced. Like UniformTabulated2DFunction, it assumes uniform
  intervalls of the sampling points in X direction, but in contrast to
  UniformTabulated2DFunction, the Y locations of the sampling points
  can be set freely (as long as they are specified in increasing order
  for each x value)
- add a unit test for the two tabulation classes
2014-07-24 14:12:04 +02:00
Andreas Lauser
ef6cddfb1c peng-robinson test: fix it, so that it produces correct output 2014-07-23 17:45:12 +02:00
Andreas Lauser
adf7f4460d black oil density: correct the gas mass fraction in saturated oil 2014-07-22 19:16:55 +02:00
Andreas Lauser
f6ce0d0f64 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:30:42 +02:00
Andreas Lauser
42d0f895e9 peng-robinson test: correct calculation of the Rs factor 2014-07-08 12:43:44 +02:00
Andreas Lauser
17dbe13a7f FindCXX11Features: check for a usable std::regex
and add a config.h variable in the opm-parser test.
2014-07-07 18:05:16 +02:00
Andreas Lauser
85e0540236 BlackOilFluidSystem: some improvements
the biggest one was that the Rs factor was used incorrectly: instead
of "surface volume of gas per volume of saturated reservoir oil" it is
defined as "surface volume of gas which a volume unit of surface oil
dissolves at reservoir pressure".

Besides this, there are a few smallish improvements like the oil
density being a function which can be called without having the
boilerplate objects (i.e., the fluid state and parameter cache
objects) instantiated.
2014-07-07 12:09:45 +02:00
Andreas Lauser
af5228cb21 improve a few comments and error messages 2014-07-07 12:07:48 +02:00
Andreas Lauser
9e8576273f syncronize build system with opm-core 2014-06-29 14:51:34 +02:00
Arne Morten Kvarving
9dcc42df69 fixed: dune-cornerpoint (now) needs the dune-common version information 2014-06-29 14:46:04 +02:00
Atgeirr Flø Rasmussen
6e546f9883 Fix option name to match name in use in conditional.
Also add a useful doc string.
2014-06-29 14:46:02 +02:00
Atgeirr Flø Rasmussen
a70b41d0cd Merge pull request #17 from bska/017_cmake
Synchronise build system with OPM-Core
2014-06-17 08:37:05 +02:00
Arne Morten Kvarving
9372bd967d added: hook for conditionally compiled files
backport from opm-upscaling PR#100
2014-06-16 16:25:20 +02:00
Andreas Lauser
566fdc6448 fix another off-by-one error
quite certainly, this won't be the last...
2014-05-23 14:02:13 +02:00
Andreas Lauser
c219585cf8 1p/2p fluid systems: rename them to more sensfull class names
they were totally inconsistent with the remaining fluid systems
because their file names stated with a number and "P" was used instead
of "Phase"...
2014-05-08 17:02:28 +02:00
Andreas Lauser
e93e9018b1 make the EclDefaultMaterial actually work
in the sense that it is now used by an eWoms simulator
2014-04-28 19:11:53 +02:00
Andreas Lauser
445442d493 Black-oil fluid system: take advantage of opm-parser
this considerably simplifies reading blackoil PVT parameters from an
ECL deck file.
2014-04-25 17:10:44 +02:00
Andreas Lauser
b7b285f7ad synchronize the build system with opm-core 2014-04-23 16:51:03 +02:00
Andreas Lauser
ccfbb87021 make the "-Wl,--as-needed" flag optional
as there is not much harm done if it is not used but it may cause the
build to fail if it is present (read: it causes _my_ build to fail),
it defaults to OFF.
2014-04-23 16:48:39 +02:00
Andreas Lauser
4b46bb1237 do not add the "-Wl,--as-needed" linker flag in FindSuiteSparse.cmake
because if umfpack is fully linked but some other library is
underlinked, it causes the build to fail. This flag is better dealt
with in the "UseOnlyNeeded.cmake" module...
2014-04-23 16:48:30 +02:00
Bård Skaflestad
1122820f82 Search for MPI support
The build system depends on knowing if MPI is available.  Explicitly
search for MPI to honour that requirement.  Don't rely on ISTL's
transitive searching for the same.
2014-04-23 16:46:47 +02:00
Andreas Lauser
ce41f40a5f add support for the UG grid library
recently UG has become free software (yay!), so we can now support it
with a good conscience. The CMake module is based on the "UseUG.cmake"
module of dune-grid but it is quite a bit simpler and actually
works. (I cannot see how UseUG.cmake can work without ever including
the ug-config*.cmake files...)

the UG source code is available here:

https://github.com/ugfem/ug
2014-04-23 16:44:06 +02:00
Markus Blatt
f86221a1b1 Export HAVE_DUNE_ISTL for other modules.
This is e.g. needed in the parallel version of autodiff to
test whether ISTL is there.
2014-04-23 16:43:00 +02:00
Andreas Lauser
1ee8a95b3f convert to opm-parser
and fix some (likely) bugs...
2014-04-16 12:30:13 +02:00
Andreas Lauser
30c90734ce fluid systems: rename unexpressive phase and component indices
These index names have been fully fluid system dependent for a while
and are supposed to be just used for convenience. This means that
phase names are now actual camelCase words.
2014-04-03 17:27:22 +02:00
Andreas Lauser
b2beeb211a EclDefaultMaterial: fix sign error 2014-03-27 19:06:50 +01:00
Andreas Lauser
49ec85abab fluid-matrix interactions: remove "3p" folder
because fluid-matrix interactions have been independent of the number
of phases for a while. The only law left in this folder (implementing
the Parker-van Genuchten law) has been moved one folder up and been
cleaned up considerably.
2014-03-27 19:06:50 +01:00
Andreas Lauser
a532d0ed6a update README
thanks to Atgeirr Rasmussen for the ping!
2014-03-27 16:10:28 +01:00
Kristian Flikka
7e11580f46 Only look for BOOST´s unit test framework module if not already found. Sync version with rest of system 2014-03-11 20:43:04 +01:00
Bård Skaflestad
866ec26a49 Elucidate description string for opm-parser.
The 'opm-parser' module is (currently) designed to parse ECL-type
simulation models.  Reflect that fact in its description.
2014-03-05 16:30:55 +01:00
Bård Skaflestad
c361ac6e95 Defer searching for opm-parser
The "opm-parser" module is expected to become dependent upon the ERT
library.  Defer searching for the parser module until we've
established whether or not ERT is availble.

Suggested by: @andlaus
2014-03-05 16:30:54 +01:00
Bård Skaflestad
d690613f72 Restore C++-11 checks
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
2014-03-05 16:30:54 +01:00
Bård Skaflestad
688cabc33d Fix mis-merge.
In propagating the requirements for opm-benchmarks to the other
modules I accidentally removed the 'opm-parser' prerequisite (see
commit 86439d6 for details).  This commit restores that prerequisite.
2014-03-05 16:30:54 +01:00
Bård Skaflestad
4dc6f83729 Depend on Boost.Iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-03-05 16:30:54 +01:00
Bård Skaflestad
d5692b85b6 Reformat prerequisite file according to convention
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
2014-03-05 16:30:54 +01:00
Joakim Hove
02d4f6c414 Set the boost version requirement to 1.44 - and added cJSON dependency 2014-03-05 16:30:54 +01:00