Commit Graph

271 Commits

Author SHA1 Message Date
Robert Kloefkorn
70e4c0c4d3 Make ewoms find dune-fem. 2015-08-05 18:21:30 +02:00
Arne Morten Kvarving
2596ad7d3c Merge pull request #31 from joakim-hove/find-ert-python
Changed code for finding ERT Python
2015-08-04 13:06:54 +02:00
Joakim Hove
27b22341d9 Changed code for finding ERT Python
- Using standard python 'import ert' and introspection.
 - Using dist-packages (debian) and site-packages (!debian).
 - In separate cmake module FindERTPython.cmake
2015-08-04 13:04:43 +02:00
Arne Morten Kvarving
05bf882dba Merge pull request #28 from andlaus/define_HAVE_TYPE_TRAITS
opm-material: add HAVE_TYPE_TRAITS to config.h
2015-08-04 11:39:44 +02:00
Arne Morten Kvarving
4db28ac9e0 Merge pull request #30 from andlaus/parmetis_use_sequential_metis_module
FindParMETIS: use the FindMETIS module to deal with sequential METIS
2015-08-04 11:39:20 +02:00
Andreas Lauser
5e30e3a4ab FindParMETIS: use the FindMETIS module to deal with sequential METIS
for me, 4292de413f lead to linker errors
if the sequential metis library was required (and the parallel is not
installed).  see e.g.,

http://www.opm-project.org/CDash/viewBuildError.php?buildid=41290

The reason for this is a partial clash in the variable names which are
used by both modules. With this PR, the FindParMETIS module does not
write to any variables that are prefixed by "METIS_".
2015-08-04 11:32:00 +02:00
Arne Morten Kvarving
ae71c89e6c Merge pull request #29 from andlaus/disable_sibling_search_in_configure
configure wrapper: disable the sibling search
2015-08-03 13:38:04 +02:00
Andreas Lauser
9644664e03 configure wrapper: disable the sibling search
if the 'configure' wrapper is used, you will most likely use
dunecontrol. since duncontrol explicitly passes the paths for all the
dependencies, the "convenience" of the sibling search not wanted in
most cases.
2015-08-03 13:28:16 +02:00
Andreas Lauser
6af5c6070b opm-material: add HAVE_TYPE_TRAITS to config.h
dune has a compatibility layer for std::conditional and some versions
of it emit a deprecation warning if the HAVE_TYPE_TRAITS macro is
undefined:

http://opm-project.org/CDash/viewBuildError.php?type=1&buildid=41175
2015-07-29 14:14:25 +02:00
Arne Morten Kvarving
6ddc6c077b Merge pull request #27 from andlaus/opm-core_requires_opm-material
add opm-material to the prerequisites of opm-core
2015-07-28 18:23:44 +02:00
Andreas Lauser
6a3309e27d add opm-material to the prerequisites of opm-core 2015-07-28 17:26:22 +02:00
Arne Morten Kvarving
4292de413f Merge pull request #26 from blattms/add-parmetis-module
Addes a module for finding ParMETIS or the ParMETIS interface of Scotch
2015-07-24 15:39:52 +02:00
Markus Blatt
191e8994be Addes a module for finding ParMETIS or the ParMETIS interface of PT-Scotch.
The AMG within dune-istl issues a warning if ParMETIS is not available.
The reason is that it uses ParMETIS or the ParMETIS bindings of PT-Scotch
to redistribute the load on the coarse levels. Even with an installed and
found PT-Scotch we need to adapt the include path and the libraries linked
to make it work.

Therefore this commit adds a module for searching for ParMETIS and activates
it whenever dune-istl is a dependency. With this the warning about missing
ParMETIS for flow_cp vanishes.
2015-07-24 15:30:17 +02:00
Arne Morten Kvarving
5c7ea4a2eb Merge pull request #25 from akva2/add_ert_python
Look for python module in ERT
2015-07-15 15:37:03 +02:00
Arne Morten Kvarving
cfd0fa55cb added: look for python module in ERT 2015-07-15 15:00:23 +02:00
Arne Morten Kvarving
afcf0d2917 changed: declare check target before calling test hook
in order for test hook to be able to add dependencies to the target
2015-07-15 15:00:16 +02:00
Bård Skaflestad
5cdafe0f52 Merge pull request #24 from akva2/refine_static_targets
Refine static targets
2015-07-01 10:15:13 +02:00
Arne Morten Kvarving
706e49075c changed: refined OpmStaticTargets
- pass on toolchain file
- don't build examples in static directories
- allow non-install mode and custom targets in opm_from_git
- use origin/master to make sure static source trees are built from the
  top should user re-execute the build in an existing build tree
2015-06-30 10:12:03 +02:00
Arne Morten Kvarving
6ecf5313aa added: support ADDITIONAL_SOURCE_FILES
use this for for non-abandoned programs which should
not be built by the default target
2015-06-29 14:28:45 +02:00
Andreas Lauser
72989ba383 Merge pull request #19 from akva2/add_static_targets
added: file for building opm modules static in your build tree
2015-06-29 11:31:39 +02:00
Arne Morten Kvarving
f747a22d97 added: file for building opm modules static in your build tree
will be used for creating static benchmark executables
2015-06-29 10:11:25 +02:00
Arne Morten Kvarving
5eae64a751 Merge pull request #23 from andlaus/allow_custom_doxygen_layout
some doxygen cleanups
2015-06-19 13:38:12 +02:00
Andreas Lauser
0275e0df85 make it possible for user modules to specify their own doxygen layout file
by default, the one shipped with opm-cmake is used and everything stays
as before.
2015-06-19 13:14:22 +02:00
Andreas Lauser
381b8eb409 fix a bunch of doxygen warnings 2015-06-19 13:14:19 +02:00
Andreas Lauser
2feea186c2 Merge pull request #20 from OPM/check_for_librt
fix clock_gettime() on older systems
2015-06-16 14:42:01 +02:00
Andreas Lauser
92c004148b Merge pull request #22 from OPM/keep_custom_compiler_flags
configure wrapper: switch the build type to "Custom" if any compiler flags are set
2015-06-16 11:25:11 +02:00
Andreas Lauser
0fd8b6aa17 configure wrapper: switch the build type to "Custom" if any compiler flags are set
this makes the build system respect these flags if it is used with dunecontrol.
2015-06-15 11:32:13 +02:00
Andreas Lauser
39b9e05420 Merge pull request #21 from dr-robertk/PR/fix-configure-zoltan
make configure work for ZOLTAN when used with dunecontrol.
2015-06-11 11:06:20 +02:00
Robert Kloefkorn
c50f129c67 make checks work when used with dunecontrol. 2015-06-10 11:22:43 +02:00
Atgeirr Flø Rasmussen
fbd0558e2d Merge pull request #12 from akva2/fix_tests
Fix tests
2015-06-10 10:13:29 +02:00
Andreas Lauser
38c7ae48ce fix clock_gettime() on older systems
it seems like old systems need to link to librt for this
function. (for newer ones it is already included in libc.)
2015-06-05 13:27:55 +02:00
Joakim Hove
d1348d52b8 Merge pull request #8 from joakim-hove/FindERT-cxx
Updated FindERT.cmake to look for libeclxx.
2015-05-29 09:21:16 +02:00
Bård Skaflestad
7da7be28e7 Merge pull request #17 from akva2/add_check_commits
added: check-commits target
2015-05-28 16:39:02 +02:00
Andreas Lauser
f0355ca97e Merge pull request #18 from akva2/arguments_as_list
changed: allow passing test arguments as a list
2015-05-28 14:07:25 +02:00
Joakim Hove
2f02c8af94 Updated FindERT.cmake to look for libeclxx. 2015-05-28 12:28:02 +02:00
Joakim Hove
08b75a6ecf Merge pull request #16 from akva2/fix_ecl_well
added: look for ecl_well include paths
2015-05-28 12:22:41 +02:00
Arne Morten Kvarving
8d9f8dcdc0 changed: allow passing test arguments as a list
we don't want to do nasty quoting all over
2015-05-28 12:12:26 +02:00
Arne Morten Kvarving
cef4a645e5 added: look for ecl_well include paths
broke ERT sibling builds
2015-05-28 10:37:42 +02:00
Arne Morten Kvarving
d8ce071287 added: check-commits target 2015-05-28 10:08:46 +02:00
Arne Morten Kvarving
3d5f384251 Merge pull request #14 from andlaus/fix_opm_add_test_regressions
Fix opm add test regressions
2015-05-28 09:43:03 +02:00
Arne Morten Kvarving
0c10c67d03 Merge pull request #15 from joakim-hove/opm-parser-generated-headers
Will look for generated headers in opm-parser
2015-05-28 09:38:42 +02:00
Joakim Hove
0383d56116 opm-parser: will look for generated headers 2015-05-27 22:34:39 +02:00
Andreas Lauser
9d65ba81ce opm_add_test: make default working directory configurable
The "default default" is the source directory of the project in order
to avoid having to copy the data files which are necessary for
executing the tests. (copying them is an almost impossible thing to do
in general, since the file system layout of the project is not
standardized.) this can be changed using the new
opm_set_test_default_working_directory() macro.

having said this, some tests may have to write some output to disk
during execution and the source directory should not be assumed to be
writable (e.g., it could be burned on a DVD), i.e., using the build
directory by default would be the more sensible choice IMO.
2015-05-27 16:38:59 +02:00
Andreas Lauser
d2ba06bc83 fix the eWoms regressions caused by PR#9
The most important issue was that PR#20 removed the possibility to use
a test driver script. In eWoms, this script is responsible for
(fuzzily) comparing the results of the test runs with reference
solutions, to test the simulators in parallel and compare the results,
and to make sure that the --help command continues to work as
intended.

The approach taken to bring this functionality back is to specify the
test driver script and its parameters using the new macro
'opm_set_test_driver(${DRIVER_COMMAND} ${DRIVER_DEFAULT_ARGUMENTS})'
before the first call to 'opm_add_test'. If no test driver is
specified, the binary is run 'naked', so nothing should change in this
case.
2015-05-27 13:58:39 +02:00
Joakim Hove
b81939ea3a Merge pull request #13 from akva2/more_ert_siblings
added: look for ERT in some more sibling directories
2015-05-27 13:08:14 +02:00
Arne Morten Kvarving
ce17de6856 added: look for ERT in some more sibling directories 2015-05-27 12:24:55 +02:00
Arne Morten Kvarving
d9839f5521 fix dynamic boost test 2015-05-27 10:29:25 +02:00
Arne Morten Kvarving
f23305009e fixed: make sure test-suite target exists for tests added as satellites
needed by the 'check' target and as a means to build tests if
BUILD_TESTING is off
2015-05-27 10:02:33 +02:00
Joakim Hove
33ea6f157c Merge pull request #11 from akva2/fix_test_depends
changed: add TEST_DEPENDS parameter in opm_add_test
2015-05-27 09:49:29 +02:00
Arne Morten Kvarving
444678966e changed: add TEST_DEPENDS parameter in opm_add_test
existing DEPENDS parameter was for test interdependencies and not
target dependencies. reserve DEPENDS for target dependencies
2015-05-27 09:14:01 +02:00