OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,428 Commits 24 Branches 102 Tags 90 MiB
1195ced57a
Commit Graph

1428 Commits

Author SHA1 Message Date
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 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 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 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
8fecf98f37 [cleanup] remove commented code. 2014-12-05 14:50:55 +01:00
Robert K
230447bea0 [cleanup] I revert the sort call to QuickSort again since it's faster on my machine. 2014-12-05 14:48:16 +01:00
dr-robertk
1cd3dcadc6 Merge pull request from atgeirr/performance-mods 
Performance mods from atgeirr, great job.
 2014-12-05 14:47:18 +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
Atgeirr Flø Rasmussen
cda742ab0e Redo commit 6f55c862 after rebasing. 2014-12-05 13:10:33 +01:00
Atgeirr Flø Rasmussen
5b6765f9d8 Use fastSparseProduct() in place of Eigen's product. 2014-12-05 13:09:46 +01:00
Atgeirr Flø Rasmussen
c43b9f4a22 Use fastSparseProduct(), do not use hijacked Eigen header. 2014-12-05 13:09:46 +01:00
Atgeirr Flø Rasmussen
e8b3524ffa Add Robert Kloefkorn's fast sparse product implementation. 2014-12-05 13:08:30 +01:00
Robert K
6f55c862ce move Index query into if. 2014-12-04 17:55:29 +01:00
Robert K
cbfb4f0489 remove typename. 2014-12-04 14:01:06 +01:00
Robert K
855c278197 cleanup 2014-12-04 12:46:46 +01:00
Robert K
5583585063 Merge branch 'PR/performance-avoid-zero-matrix-entries' of ssh://github.com/dr-robertk/opm-autodiff into PR/performance-avoid-zero-matrix-entries 
Conflicts:
	opm/autodiff/ConservativeSparseSparseProduct.h
 2014-12-03 15:50:41 +01:00
Robert K
0495aaae8f if one of the matrices involved does not contain nonZeros, we can leave the product 
routine.

Conflicts:
	opm/autodiff/ConservativeSparseSparseProduct.h
 2014-12-03 15:49:26 +01:00
Robert K
21a9a7c446 avoid multiplication with empty matrices. 2014-12-03 15:48:43 +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
Robert K
54feee5987 avoid the multiplication with zero matrix entries. 2014-12-02 14:57:00 +01:00
Robert K
054d4f4dcb include vector to make compile on proprietary systems. 2014-12-02 14:15:17 +01:00
Robert K
efe8ee79f9 added collapseJacs method. 2014-12-02 12:39:21 +01:00
Robert K
2ac6a211b2 use correct types of SparseMatrices. 2014-12-02 12:39:21 +01:00
Robert K
a266e98bac added some comment about sort. 2014-12-02 12:39:21 +01:00
Robert K
c51a794cac overloaded ConservativeSparseSparseProduct to speed up matrix-matrix multiplication. 2014-12-02 12:39:17 +01:00
Robert K
3f821f1d5f overloaded ConservativeSparseSparseProduct to speed up matrix-matrix multiplication. 2014-12-02 10:40:48 +01:00
Robert K
42d8a466ba added ConservativeSparseSparseProduct.h 2014-12-02 10:40:45 +01:00
Atgeirr Flø Rasmussen
dacfbcc583 Merge pull request 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 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 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 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
Andreas Lauser
9e93fa2298 register the transmissibilities at the EcliseWriter 
missing: the simulator using dune-cornerpoint. Once again, this is
because there is no good way to convert an intersection to a unique
global index (yet).
 2014-11-21 13:20:53 +01:00
Atgeirr Flø Rasmussen
8cd993b9d2 Merge pull request 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 from akva2/fix_opmparser 
fix opm-parser find rule
 2014-11-19 08:55:24 +01:00