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

2521 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad
2ec15ab74a Merge branch 'master' into gravity-in-wells 2012-10-25 10:44:17 +02:00
Atgeirr Flø Rasmussen
319fb8df50 Merge pull request #84 from bska/fix-equality-comparisons 
Fix well classification that was only correct by accident
 2012-10-25 01:08:48 -07:00
Atgeirr Flø Rasmussen
cc6c9311a0 Merge pull request #85 from bska/use-standard-sh-in-ac 
Don't use '==' when '=' is equally good
 2012-10-25 01:07:47 -07:00
Bård Skaflestad
8cda8dfda0 Don't use '==' when '=' is equally good 
There is no need to use Bash-specific operators when the pure sh(1)
built-in test operators have the exact same semantics.  This increases
portability to systems for which /bin/sh is *not* Bash (or Dash).
 2012-10-25 00:22:22 +02:00
Bård Skaflestad
3e20f4ed2b Merge branch 'master' into gravity-in-wells 2012-10-24 22:43:25 +02:00
Bård Skaflestad
eec1552789 Merge pull request #82 from rolk/cxx0x 
Build opm-core with C++0x support if available
 2012-10-24 12:42:17 -07:00
Roland Kaufmann
09f458f5ee Remove superfluous construction by std::make_pair 
Since we know the type of the components, we may just as well create the
pair directly! (Using make_pair invokes compiler bugs in GCC).
 2012-10-24 21:22:11 +02:00
Bård Skaflestad
c8dedfde06 Fix well classification that was only correct by accident 
Specifically, the tests

   if (!wells->type[self_index] == INJECTOR)
   if (!wells->type[self_index] == PRODUCER)

produced the expected results *only* because INJECTOR==0 and PRODUCER==1
in the WellType enumeration, thus (!INJECTOR == PRODUCER) and
(!PRODUCER == INJECTOR).

Installing the (much) more appropriate

    if (wells->type[self_index] != INJECTOR)
    if (wells->type[self_index] != PRODUCER)

is not only more readable, it is also future-proof and scales better if
we ever introduce new WellTypes (e.g., a MONITOR).
 2012-10-24 21:12:29 +02:00
Bård Skaflestad
672ff95ae8 Replace !(a==b) test with a more common a!=b test 2012-10-24 21:02:46 +02:00
Bård Skaflestad
10b3c717b3 Merge branch 'master' into gravity-in-wells 2012-10-24 14:45:55 +02:00
Bård Skaflestad
ae9e003a90 Merge pull request #83 from rolk/recommends 
Update recommendations for building OPM
 2012-10-24 05:36:45 -07:00
Roland Kaufmann
6a4f6ade42 Warn that OPM should not be built differently from DUNE. 
Using headers and libraries from a DUNE built with different options
than OPM, can result in strange ABI errors such as a segmentation
fault in the static initialization section.
 2012-10-24 12:51:50 +02:00
Roland Kaufmann
c6bd22b90b Recommend parallel builds 
Load average of 0.9 is something that even a PhD student's crappy
laptop computer should be able to handle, without completely killing
it.

It really should be something like:

 make -j -l $(echo \($(grep "^processor" /proc/cpuinfo)+1\)\*0.9 | bc)

but that is probably far too complex to put in a README. The average
developer should be able to pick a reasonable value themselves.
 2012-10-24 12:39:31 +02:00
Roland Kaufmann
e8444f91e0 Replace deprecated AC_TRY_COMPILE with AC_COMPILE_IFELSE 2012-10-24 12:01:38 +02:00
Roland Kaufmann
bb96a2e269 Refrain from using reserved names ac_* for variables 2012-10-24 11:39:51 +02:00
Roland Kaufmann
9063a47051 Disable checks for C++11 if C++0x is disabled 
By adding an extra test we can avoid the somehow illogical possibility
of building with '--enable-gxx11check --disable-gxx0xcheck'.
 2012-10-24 11:25:28 +02:00
Roland Kaufmann
6d2f7e1f7c Compile with C++0x support if possible 
Since DUNE does this, it might a good idea to track the same ABI.
 2012-10-24 10:32:23 +02:00
Roland Kaufmann
056bce2128 Distinguish between C++0x and C++11 in conf. opts. 
Surely this must have been a copy&paste error.
 2012-10-24 10:28:48 +02:00
Roland Kaufmann
2a43bd305a Add macros for testing C++0x/11 support in compiler 
These files are shamelessly ripped from dune-common/m4 (e28ca3)
 2012-10-24 10:23:51 +02:00
Bård Skaflestad
d2ab445ba6 Merge branch 'master' into gravity-in-wells 2012-10-24 10:09:31 +02:00
Bård Skaflestad
29ccdb7513 Merge pull request #81 from rolk/pair0x 
Make opm-core compilable in C++0x mode on Ubuntu Precise
 2012-10-24 00:59:02 -07:00
Roland Kaufmann
359fdb1428 Make GCC 4.6.3 happy in C++0x mode 
It complains about not finding a match for the pair<> template class,
because the first parameter (this) is allegedly const. However, this
isn't a const method, so I suspect it is a compiler bug.

In order to move on, I slap on a harmless cast which will make this
particular compiler happy, and which should have no effects elsewhere,
but put it in a #if..#else..#endif macro to avoid warnings on others;
hopefully this also makes it easier to spot and remove in the future.
 2012-10-24 09:57:12 +02:00
Bård Skaflestad
ff8665017c Merge branch 'master' into gravity-in-wells 2012-10-23 16:39:18 +02:00
Bård Skaflestad
58def2a9e3 Merge pull request #80 from rolk/add_boost 
Add Boost unit test framework to test case linking
 2012-10-23 06:40:08 -07:00
Roland Kaufmann
14818d49b4 Add Boost unit test framework to test case linking 2012-10-23 15:36:48 +02:00
Atgeirr Flø Rasmussen
6c6c5fe893 Merge pull request #78 from bska/ert-fix-warnings 
Ert fix warnings
 2012-10-23 06:13:28 -07:00
Bård Skaflestad
b1f61d93c4 Merge branch 'master' into gravity-in-wells 2012-10-23 14:47:39 +02:00
Bård Skaflestad
f8a11ef7e1 Staticise a file-local function. 
It is not needed outside this function.  We should, arguably, be using
an anonymous namespace in this case.
 2012-10-23 14:36:13 +02:00
Bård Skaflestad
b334dbcdd8 Remove a shadowed variable. 
This variable (ecl_kw) was only needed in an inner scope and re-declared
there.
 2012-10-23 14:33:30 +02:00
Bård Skaflestad
0efcf9e806 Merge pull request #77 from joakim-hove/IMPORT 
Small utility examples/import_rewrite to update ECLIPSE deck to use IMPORT keywords
 2012-10-23 05:21:56 -07:00
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
285b356755 Merge branch 'master' into gravity-in-wells 2012-10-19 16:06:26 +02:00
Bård Skaflestad
7cf40d51e4 Merge pull request #76 from rolk/cmake-compat 
Provide CMake config mode files for custom builds
 2012-10-19 06:52:23 -07:00
Roland Kaufmann
14b6812cb2 Provide CMake config mode files for custom builds 
Client programs/libraries that uses CMake as their build system should
be able to point at the directory of a OPM-core build tree and have its
library picked up from there.
 2012-10-19 14:14:15 +02:00
Bård Skaflestad
37d54be703 Merge branch 'master' into gravity-in-wells 2012-10-18 10:58:28 +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
011fe02f59 Merge branch 'master' into gravity-in-wells 2012-10-17 22:10:14 +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
a593efb1ea Merge branch 'master' into gravity-in-wells 2012-10-17 13:30:37 +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