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

2477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
0c0ee4b4a8 Added some comments + error checking 2012-10-23 13:02:48 +02:00
Joakim Hove
cab0872048 Added HAVE_ERT compile guard in examples/Makefile.am 2012-10-23 09:43:02 +02:00
Joakim Hove
9db7ce3647 examples/import_rewrite now recursively follows INCLUDE files 2012-10-23 09:42:28 +02:00
Joakim Hove
ac48c44712 Fixed name in examples/Makefile.am 2012-10-22 17:31:32 +02:00
Joakim Hove
00dc06f074 Added example/import_rewrite 2012-10-22 17:17:16 +02:00
Joakim Hove
564ba1c3aa Changed functions readKeyword and classifyKeyword to become static methods in class EclipseGridParser. 2012-10-21 21:51:13 +02:00
Bård Skaflestad
17643c0fad Merge pull request #75 from atgeirr/velocity_interpolation 
Reinstate disabled test. Assert more.
 2012-10-18 01:56:59 -07:00
Atgeirr Flø Rasmussen
3a61778066 Reinstate disabled test. Assert more. 2012-10-18 10:51:12 +02:00
Bård Skaflestad
476888cec8 Merge pull request #74 from atgeirr/velocity_interpolation 
Add unit tests for velocity interpolation classes
 2012-10-17 13:02:02 -07:00
Atgeirr Flø Rasmussen
4741d52577 Merge branch 'master' into velocity_interpolation 2012-10-17 21:36:04 +02:00
Atgeirr Flø Rasmussen
aec8029e85 Added unit test for velocity interpolation. 2012-10-17 21:33:09 +02:00
Atgeirr Flø Rasmussen
dcee95ec96 Fix support for velocity interpolation in 2d. 2012-10-17 21:30:53 +02:00
Bård Skaflestad
73a836de8f Merge pull request #73 from atgeirr/velocity_interpolation 
Fix output in case of LAPACK error.
 2012-10-17 03:53:27 -07:00
Atgeirr Flø Rasmussen
f9efd72ecc Fix output in case of LAPACK error. 
Make copy of matrix before calling dgesv, since it will overwrite it.
 2012-10-17 12:40:43 +02:00
Bård Skaflestad
a98be4e592 Merge pull request #72 from atgeirr/velocity_interpolation 
Velocity interpolation for DG methods
 2012-10-17 03:36:41 -07:00
Atgeirr Flø Rasmussen
30797cae1d Implement setupFlux() method. 
Also fix bug related to face orientation in cartToBaryWachspress().
 2012-10-17 11:16:42 +02:00
Atgeirr Flø Rasmussen
ab910f3778 Finished VelocityInterpolationECVI constructor. 
Untested so far.
 2012-10-16 20:19:17 +02:00
Atgeirr Flø Rasmussen
7cf412340b Use new velocity interpolation interface. 
The class TransportModelTracerTofDiscGal now uses
VelocityInterpolationInterface, and acts as a factory
internally, choosing an interpolation method depending on
the parameter 'use_cvi'.
 2012-10-16 11:11:33 +02:00
Atgeirr Flø Rasmussen
121bb79f91 New abstract class VelocityInterpolationInterface. 
Also, two initial subclasses: VelocityInterpolationConstant
and VelocityInterpolationECVI. The latter is still a work in
progress.
 2012-10-16 11:07:05 +02:00
Atgeirr Flø Rasmussen
b7a4f95716 Merge pull request #71 from bska/parser-suppress-warning 
Suppress warning about unused variable in !HAVE_ERT case.
 2012-10-15 03:54:00 -07:00
Bård Skaflestad
fde3565f63 Merge pull request #70 from rolk/expl-blas 
Make it harder to select wrong BLAS/LAPACK libraries
 2012-10-14 14:25:16 -07:00
Roland Kaufmann
1689074d4f Abort build process if BLAS or LAPACK not found 2012-10-14 21:58:28 +02:00
Roland Kaufmann
c8a52177bf Honor explicit specification of BLAS/LAPACK libraries 
Only probe for libraries on system if no library is specified. If there
is an error with the library that is specified as an argument, then
raise an error instead of continuing to look for other libraries with a
simple warning buried deep in the configuration log.
 2012-10-14 21:58:27 +02:00
Bård Skaflestad
db77953c39 Suppress warning about unused variable in !HAVE_ERT case. 2012-10-14 17:55:51 +02:00
Atgeirr Flø Rasmussen
279fbb8267 Merge pull request #68 from rolk/am-fix 
Very minor nitpicks in the build system
 2012-10-14 03:40:55 -07:00
Atgeirr Flø Rasmussen
efcec7aae5 Merge pull request #69 from alfbr/master 
Minor clean-up of README
 2012-10-14 03:40:39 -07:00
rustad
143da5a929 Added dependency for server edition and reference to ppa in build instructions. 2012-10-14 12:04:57 +02:00
Roland Kaufmann
3521a0bdc6 Use round parenthesis for Make variables 2012-10-14 10:19:35 +02:00
Roland Kaufmann
97e176f021 Add missing line continuation character 
When this is missing, any macros later defined for the SuperLU library
will "fall off" the list.
 2012-10-14 10:18:52 +02:00
Atgeirr Flø Rasmussen
81f8a9895d Merge pull request #67 from bska/master 
Merge ERT Branch
 2012-10-12 10:38:51 -07:00
Bård Skaflestad
3e95330e25 Merge branch 'ert' 2012-10-12 14:50:23 +02:00
Bård Skaflestad
b348a21833 Merge pull request #66 from atgeirr/implement_import 
Implement IMPORT keyword in EclipseGridParser
 2012-10-12 05:38:15 -07:00
Atgeirr Flø Rasmussen
863eae3368 Hook IMPORT keyword to function reading binary input. 
Make sure it compiles and links both with and without ert.
 2012-10-12 14:25:53 +02:00
Atgeirr Flø Rasmussen
0f549358a9 Squash warnings. 2012-10-12 14:23:55 +02:00
Atgeirr Flø Rasmussen
89750d856a Merge remote-tracking branch 'bspj/master' into ertekrok 2012-10-12 13:05:31 +02:00
Bård Skaflestad
d6d7714747 Merge pull request #65 from atgeirr/rename_variable 
Rename function argument and variable.

Thanks.  This brings welcome clarity.
 2012-10-12 02:13:10 -07:00
Bård Skaflestad
2e937103dc Merge pull request #64 from bska/ert 
Bring ERT branch up-to-date with recent changes in master

Fix merge conflicts in the process.
 2012-10-12 02:09:56 -07:00
Bård Skaflestad
ce3b1d5e49 Merge branch 'master' into ert 2012-10-12 11:07:42 +02:00
Bård Skaflestad
3a34c2a8dc Merge remote-tracking branch 'origin/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 11:04:20 +02:00
Bård Skaflestad
1a0eeb47ba Merge remote-tracking branch 'upstream/ert' into ert 
Conflicts:
	Makefile.am
 2012-10-12 10:58:16 +02:00
Atgeirr Flø Rasmussen
27b8314521 Rename function argument and variable. 
rock_comp -> rock_comp_props
 2012-10-12 09:21:52 +02:00
Bård Skaflestad
5f4aac1da7 Merge pull request #63 from alfbr/master 
Dependency update for Ubuntu 12.04
 2012-10-11 15:54:53 -07:00
Bård Skaflestad
31174cf727 Merge remote-tracking branch 'upstream/master' into ert 
Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.
 2012-10-12 00:43:51 +02:00
rustad
70aa2465d3 Added dune-grid as dependency since it is needed by several opm modules. 
Changed libxml0-dev to libxml2-dev since the former does not exist.
 2012-10-11 23:47:07 +02:00
Bård Skaflestad
09b2ecc5de Merge pull request #62 from rolk/master 
Add needed/remove unneeded linker dependencies
 2012-10-11 04:48:54 -07:00
Roland Kaufmann
057b5071c9 Ignore binaries from new examples and tests 2012-10-11 13:25:25 +02:00
Roland Kaufmann
45c21f4fe0 Remove superfluous dependencies to SuperLU and BLAS 2012-10-11 13:25:10 +02:00
Roland Kaufmann
12f9bc5dbd Link compute_tof example to boost::filesystem 2012-10-10 23:57:36 +02:00
Bård Skaflestad
cde0e93a33 Merge pull request #60 from atgeirr/master 
A small collection of bugfixes
 2012-10-10 11:03:03 -07:00
Atgeirr Flø Rasmussen
6f4775df9c Improve comment. 2012-10-10 19:23:11 +02:00