OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,500 Commits 24 Branches 101 Tags 97 MiB
a76363a7f7
Commit Graph

1500 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
5ae5525209 Revert "register the transmissibilities at the EcliseWriter" 2014-12-17 10:18:23 +01:00
Atgeirr Flø Rasmussen
1348658507 Merge pull request #249 from totto82/locTrans 
Compute half transmissibilities based on local coordinate system
 2014-12-17 00:20:11 +01:00
Atgeirr Flø Rasmussen
f8ad85d83e Merge pull request #241 from andlaus/write_transmissibilities 
register the transmissibilities at the EcliseWriter
 2014-12-16 23:35:26 +01:00
Atgeirr Flø Rasmussen
28af900f0b Merge pull request #250 from dr-robertk/PR/performance-avoid-zero-matrix-entries 
Further performance improvement by avoiding zeros in matrix-matrix product.
 2014-12-16 14:12:14 +01:00
Joakim Hove
f1e64a3b9b Merge pull request #257 from joakim-hove/move-log 
Renamed ParserLog -> OpmLog
 2014-12-16 13:23:17 +01:00
Joakim Hove
78ba6760da ERT-747: Renamed ParserLog -> Logger 2014-12-15 12:23:09 +01:00
Joakim Hove
d948777ea0 Merge pull request #255 from andlaus/remove_strict_parsing 
adapt to the removal of the "strict parsing" concept
 2014-12-11 13:20:08 +01:00
Bård Skaflestad
9a599d0e24 Merge pull request #256 from totto82/addregionTrans 
Add contribution from region multipliers
 2014-12-10 17:02:08 +01:00
Tor Harald Sandve
25a4bb5fbe Add contribution from region multipliers 
The multiplier contribution from the getRegionMultiplier is added to the
face multipliers. The getRegionMultiplier method is called with the cell
index on both side of the face in order to return the correct region
multiplier across faults.
 2014-12-10 11:46:49 +01:00
Tor Harald Sandve
6ae7f460ff Implement code style comments 2014-12-10 07:34:56 +01:00
Tor Harald Sandve
02724b7f7a Implement comments for PR#249 
1) Add the possibility for the user to chose between local and global
coordinate permeability in the transmissibility calculations.
2) Trow for CpGrid
3) Add default for switch
 2014-12-10 07:29:05 +01:00
Tor Harald Sandve
b11534b137 Compute half transmissibilities based on local coordinate system 
hTrans(cellFaceIdx) = K(cellNo,j) * sum( C(:,i) .* N(:,j), 2) /
sum(C.*C, 2),
Only for diagonal tensors, off-diagonal permeability values are ignored
without warning
 2014-12-10 07:29:05 +01:00
Andreas Lauser
69c4a6d591 adapt to the removal of the "strict parsing" concept 2014-12-09 14:18:42 +01:00
Atgeirr Flø Rasmussen
c051c7bd85 Merge pull request #254 from bska/cmake_254 
Synchronise build system with OPM core
 2014-12-08 15:31:31 +01:00
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
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 #1 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