OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
184 Commits 18 Branches 75 Tags 73 MiB
7b5d10be22
Commit Graph

184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser
ce26a7cbb6 add a hack to the configure script so that it specifies --with-opm-common for itself 
this is only needed within the opm-common module.
 2015-09-08 15:11:06 +02:00
Andreas Lauser
6b04430699 replace the stub configure script by a proper version 
this was copied from opm-core.
 2015-09-08 15:11:06 +02:00
Andreas Lauser
209f8e15d7 rename the remaining occurences of "opm-cmake" to "opm-common" 2015-09-08 15:11:06 +02:00
Andreas Lauser
8e13912b2b add CMakeLists.txt and CMakeLists_files.cmake and remove dummy Makefile 
as for the patch before, this will only strictly required once c++
code is added to the repo.
 2015-09-08 14:34:59 +02:00
Andreas Lauser
76f9bdcd9f add CMake Find module for opm-common 
this is not yet required, but it will be as soon as c++ code is added
to the repo.
 2015-09-08 10:42:46 +02:00
Arne Morten Kvarving
ea3126feb4 changed: rename to opm-common 2015-09-08 10:14:00 +02:00
Arne Morten Kvarving
a3c1c00f80 Merge pull request #34 from blattms/atgeirr-fixes-findparmetis 
Atgeirr's and my fixes findparmetis/pt-scotch
 2015-08-31 11:40:22 +02:00
Markus Blatt
74767da544 Remove Duneism of global ALL_PKG_FLAGS. 
It is not needed for OPM.
 2015-08-25 18:06:00 +02:00
Markus Blatt
4a14e8d5cd [cmake] Add more search paths to find_path with NO_DEFAULT_PATH. 
When specifying NO_DEFAULT_PATH, we have to specify include and lib
manually to find the headers and libraries. This commit does this
for FindParMETIS and FindPTScotch
 2015-08-25 18:06:00 +02:00
Atgeirr Flø Rasmussen
8ffda9d4f2 Added Scotch library to PT-Scotch libraries list. 2015-08-25 18:00:28 +02:00
Markus Blatt
de76663211 Prevents (PAR)METIS_INCLUDE_DIR-NOTFOUND variables in the include directories. 
Previously we added (PAR)METIS_INCLUDE_DIRS to CMAKE_REQUIRED_INCLUDES
even if these directories were not found and set to
(PAR)METIS_INCLUDE_DIR-NOTFOUND. Now we test whether they are found and only
use them in this case.
 2015-08-25 18:00:27 +02:00
Markus Blatt
4ece0532a2 Removes debugging output. 2015-08-25 18:00:12 +02:00
Andreas Lauser
ba17a1591c Merge pull request #33 from dr-robertk/PR/ewoms-can-use-dune-fem 
Make ewoms find dune-fem.
 2015-08-05 20:42:48 +02:00
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