Commit Graph

1214 Commits

Author SHA1 Message Date
Arne Morten Kvarving
a9deb4b367 fix opm-parser find rule
deals with the fallout of opm-parser #365 and #366
2014-12-08 15:26:48 +01:00
Arne Morten Kvarving
5dca993b69 add check-commits target 2014-12-08 15:26:18 +01:00
Andreas Lauser
6e52a7bc3b set CMake policies CMP0026 and CMP0048 to OLD
this is required for CMake 3.0 to stop it complaining that we access
the LOCATION target property and set the *_VERSION_* variables ourselves.
2014-12-08 15:24:49 +01:00
Andreas Lauser
c3304ed1a1 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-12-08 15:24:48 +01:00
Andreas Lauser
57879ab6c9 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-12-08 15:24:47 +01:00
Andreas Lauser
926685cc2c 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-12-08 15:24:46 +01:00
Andreas Lauser
cd8e4ad6a3 ewoms: make it possible to use the dune-alugrid module instead of the ALUGrid manager in dune-grid 2014-12-08 15:24:45 +01:00
Andreas Lauser
37ab6ef8a0 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-12-08 15:24:44 +01:00
Andreas Lauser
444e2be623 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-12-08 15:24:43 +01:00
Arne Morten Kvarving
a4fcc0a99f fixed: ERT depends on libdl
this issue was triggered with static libs for ERT
2014-12-08 15:24:38 +01:00
Andreas Lauser
05a607c7c9 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-12-08 15:23:51 +01:00
Andreas Lauser
4a7dea3747 FindCXX11Features: check for a usable std::regex
and add a config.h variable in the opm-parser test.
2014-12-08 15:23:28 +01:00
Andreas Lauser
8119580a8d Find-ewoms.cmake: update prerequisites 2014-12-08 15:23:07 +01:00
Andreas Lauser
dff4e8f51c 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-12-08 15:23:06 +01:00
Andreas Lauser
526af686d8 Findopm-parser.cmake: Fix it up, next try
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
2014-12-08 15:22:56 +01:00
Arne Morten Kvarving
316c0b5ad0 fixed: dune-cornerpoint (now) needs the dune-common version information 2014-12-08 15:21:49 +01:00
Bård Skaflestad
72553f314a Merge pull request #253 from joakim-hove/FindERT-update
FindERT.cmake: Look for libecl_well library
2014-12-08 13:15:18 +01:00
Joakim Hove
c6445dbe8f FindERT.cmake: Look for libecl_well library 2014-12-08 13:05:26 +01:00
Atgeirr Flø Rasmussen
2bfb928c14 Merge pull request #247 from andlaus/RateConverter_remove_averageTemperature
RateConverter: remove the unused averageTemperature() method
2014-12-08 11:01:09 +01:00
Atgeirr Flø Rasmussen
d58bfa96d7 Merge pull request #252 from dr-robertk/PR/cprpreconditioner-more-flexible-choice-of-ilu
This commits allows for flexible choice of either ILU(0) or ILU(n).
2014-12-05 16:14:47 +01:00
Robert K
5287c54c1d fix parameter order for SeqILUn. 2014-12-05 15:03:59 +01:00
Robert K
9a2a95c6eb This commits allows for flexible choice of either ILU(0) or ILU(n) where n is a
dynamical parameter given in the parameter file. The default is 0 (as before).
In addition the relaxation parameter has been added to the parameter with the
default preserving the state from before.
Also, the default parameter for use_amg and use_bicgstab in the constructor of
CPRPrecondition have been removed.
2014-12-05 14:03:58 +01:00
Andreas Lauser
1b22d3ab6b RateConverter: add missing call to averageTemperature()
thanks to [at] bska for noticing this!
2014-12-02 15:56:17 +01:00
Atgeirr Flø Rasmussen
dacfbcc583 Merge pull request #246 from atgeirr/fix-test
Fix wrong resize() usage for Eigen::Array.
2014-12-02 09:26:25 +01:00
Atgeirr Flø Rasmussen
7b2334b758 Fix wrong resize() usage for Eigen::Array. 2014-12-02 09:24:03 +01:00
Atgeirr Flø Rasmussen
710297ecd6 Merge pull request #240 from andlaus/temperature_dependent_PVT
PVT properties: allow them to be temperature dependent
2014-12-02 08:49:00 +01:00
Andreas Lauser
4e3a69cc90 PVT properties: allow them to be temperature dependent
Note that this patch does not introduce any real temperature
dependence but only changes the APIs for the viscosity and for the
density related methods. Note that I also don't like the fact that
this requires so many changes to so many files, but with the current
design of the property classes I cannot see a way to avoid this...
2014-12-01 20:06:02 +01:00
Atgeirr Flø Rasmussen
0e3d319eac Merge pull request #244 from bska/fix-build-gcc48
Include <config.h> to fix build on GCC 4.8
2014-11-27 21:13:26 +01:00
Bård Skaflestad
c69b2fd8ed Include <config.h> to fix build on GCC 4.8
GCC 4.8 provides 'nullptr' in C++11 mode.  That capability is
detected at configuration time and stored in <config.h> and we need
it when targeting Dune 2.2.1 to avoid diagnostics of the form

  [...]/dune/common/nullptr.hh:27:1:
  error: expected ‘;’ after class definition
   } nullptr = {};              // and whose name is nullptr
    ^

  [...]/dune/common/nullptr.hh:27:1:
  error: qualifiers can only be specified for objects and functions
  [...]/dune/common/nullptr.hh:27:3:
  error: expected unqualified-id before ‘nullptr’
   } nullptr = {};              // and whose name is nullptr
2014-11-27 15:12:56 +01:00
Atgeirr Flø Rasmussen
34f756cccb Merge pull request #243 from joakim-hove/init-check
Init check
2014-11-27 11:18:08 +01:00
Joakim Hove
29a0c723ef Python class TransGraph to load json from opm_init_check 2014-11-26 14:56:45 +01:00
Joakim Hove
ad92edab89 Added opm_init_check to compare OPM and Eclipse. 2014-11-26 14:56:45 +01:00
Joakim Hove
e0d39027d0 Added ignore to emacs per directory configuration file. 2014-11-26 14:56:45 +01:00
Atgeirr Flø Rasmussen
8cd993b9d2 Merge pull request #238 from dr-robertk/PR/sparselu-when-no-umfpack
[bugfix] use SparseLU when UMFPack was not found.
2014-11-19 11:27:14 +01:00
Robert K
9cffb51543 [bugfix] use SparseLU when UMFPack was not found. 2014-11-19 11:22:57 +01:00
Atgeirr Flø Rasmussen
636cb3c52c Merge pull request #236 from akva2/fix_opmparser
fix opm-parser find rule
2014-11-19 08:55:24 +01:00
Arne Morten Kvarving
68cbe6d0e9 fix opm-parser find rule
deals with the fallout of opm-parser #365 and #366
2014-11-18 13:33:33 +01:00
Bård Skaflestad
9e72ea50ad Merge pull request #234 from akva2/debian_packaging
update debian packaging
2014-11-17 18:01:58 +01:00
Arne Morten Kvarving
4e84ffbf23 update debian packaging 2014-11-17 17:57:29 +01:00
Bård Skaflestad
7ac155531a Merge pull request #233 from atgeirr/improve-cpr-performance
Improve performance of CPR preconditioner.
2014-11-14 08:47:05 +01:00
Atgeirr Flø Rasmussen
933cfaf666 Improve performance of CPR preconditioner.
This restores the performance to approximately the level it had before
the change to support non-diagonal well jacobians, for SPE9. All changes
are to the eliminateVariable() method.
 - Explicitly compute and apply the inverse.
 - Change loop ordering to apply inverse only num_eq - 1 times, instead
   of (numeq - 1)^2.
 - Use UmfPackLU instead of SparseLU.
2014-11-13 16:56:11 +01:00
Atgeirr Flø Rasmussen
f9b479a354 Merge pull request #232 from totto82/fix_output
BUGFIX. Correcting the scaling of the mass balance residual
2014-11-13 13:39:48 +01:00
Tor Harald Sandve
19605a7826 BUGFIX. Currect scale of the mass balance residual
The mass balance residual is now currectly scaled with the time
increment divided by the sum of the pore volumes. Not the opposite.
2014-11-13 11:12:52 +01:00
Bård Skaflestad
e4ad38ec31 Merge pull request #231 from atgeirr/modify-convergence-output
Improve convergence output.
2014-11-12 22:43:47 +01:00
Atgeirr Flø Rasmussen
5dcccaf568 Fix convergence output header (again). 2014-11-12 21:37:51 +01:00
Atgeirr Flø Rasmussen
e5aef85295 Merge pull request #230 from totto82/fixSchur
Solve sub matrix systems in the Schur complement
2014-11-12 14:25:12 +01:00
Atgeirr Flø Rasmussen
f17660cc37 Further output refinement. 2014-11-12 11:18:35 +01:00
Atgeirr Flø Rasmussen
7f2c649496 Fix: change a CNVO to CNVW in header printout. 2014-11-12 10:29:27 +01:00
Atgeirr Flø Rasmussen
4270d51683 Improve convergence output.
- Add CNV{W,O,G} to output.
 - Make output a bit tighter.
 - Avoid printing extra newline and header for each iteration.
2014-11-12 10:23:12 +01:00
Tor Harald Sandve
12b8e9f061 Adressing comments in the PR
1. The right hand side is solved only once
2. The solver is constructed directly with the matrix
3. const is added where it was missing
4. More commennts is added
5. Variable names are changed for clarification
2014-11-12 09:11:16 +01:00