Commit Graph
162 Commits
Author SHA1 Message Date
Andreas Lauser 05e1bd64a9 opm-material: actually check for valgrind
a config.h variable was already set but the actual test was not run
for opm-material.
2016-11-08 15:04:52 +01:00
Markus Blatt bf31f7b4e9 Force a search for installed cJSON when looking for opm-parser.
If the version within opm-parser was used then the symbols are
in libopmjson anyway.
2016-11-02 21:24:40 +01:00
Markus Blatt c7cf7d8144 Only search in PROJECT_SOURCE_DIR for cjson.
Otherwise will never find an installed version for downstream modules
as they will find the header in opm-parser but not library.
2016-11-02 21:22:58 +01:00
Markus Blatt 34ed49d765 Add external cJSON library to opm-parser_LIBRARIES. 2016-11-02 20:28:12 +01:00
Markus Blatt b75f24afc2 Use external instead of opm/json for suffixes to search for cjson of opm-parser. 2016-11-02 19:46:41 +01:00
Robert Kloefkorn b9af87abc2 [bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should be tested for. It's
not a hard dependency, though.
2016-10-18 17:30:22 +02:00
Arne Morten Kvarving e3793e3577 fixed: turns out skipping the (unnecessary) c++11 tests cause issues
these defines are not used in OPM, but they are used in headers
from dune. 10x cola for me.
2016-10-18 15:02:47 +02:00
Arne Morten Kvarving e329f502ba added: use cmake mechanisms to enable c++11 with cmake >= 3.1
as a bonus it makes it easy to experiment with c++14
2016-10-17 11:56:44 +02:00
Joakim Hove 8bb00bc1e2 Updated Findopm-output to reflect repo changes. 2016-10-07 11:31:38 +02:00
Pål Grønås Drange dac092dc8b Added FindCwrap, add to pythonpath 2016-10-04 12:57:38 +02:00
Arne Morten Kvarving 899730284a changed: update petsc module for newer petsc
newer petsc changed layout a bit. as of petsc 3.6.4 a
proper pkg-config file is ready for use.

additionally, align the find module with how petsc is expected to be
configured. the environment variable PETSC_DIR is the root of the source
tree and PETSC_ARCH is the build configuration, located in
$PETSC_DIR/$PETSC_ARCH

the old approach is kept for backwards compatibility but will not work
with newer petsc, in particular not if petsc is built static.
2016-09-29 14:17:31 +02:00
Andreas Lauser 9e0a5cea6c Merge pull request #177 from andlaus/optional_dune-localfunctions
make dune-localfunctions optional for eWoms
2016-09-22 17:20:04 +02:00
Arne Morten Kvarving 5d158d81e2 Merge pull request #176 from blattms/activate-dune-mpi-2-if-available
Check for MPI 2 functionality and activate it for DUNE.
2016-09-22 09:22:12 +02:00
Andreas Lauser 04d7375f9c make dune-localfunctions optional for eWoms
this is the build system side of OPM/ewoms#70...
2016-09-21 19:15:38 +02:00
Markus Blatt 333011212a Use MPI_C_* instead of MPI_CXX_* 2016-09-21 15:46:44 +02:00
Markus Blatt a7db2bfb2d Only search for MPI_Finalized with MPI found. 2016-09-21 15:46:01 +02:00
Markus Blatt a9d105c1a0 Check for MPI 2 functionality and activate it for DUNE.
This allow mixing the MPIHelper and MPI_Init/MPI_Finalize. This commit
makes OPM a bit more DUNE compatible.
2016-09-16 18:17:19 +02:00
Kristian Hole-Drabløs 909a00fade Changed name of cmake variables
Changed name of cmake variables due to namechange of binaries
2016-09-14 12:03:37 +02:00
Bård Skaflestad 29a1dcb6dc Update opm-flowdiagnostics system probe for API change
This commit brings the system probe for module

    opm-flowdiagnostics

up-to-date with recent changes in the public interface of the
module's main entry point.  Commit OPM/opm-flowdiagnostics@8456e81
removed the nested type

    Opm::FlowDiagnostics::Toolbox::PoreVolume

so we must drop all references to this type.
2016-08-31 22:07:46 +02:00
Andreas Lauser bf63963c0c FindQuadmath.cmake: fix the first argument of find_package_handle_standard_args()
It needs to match the filename exacly, i.e. including the case.
2016-08-24 14:56:08 +02:00
Andreas Lauser a742ddead4 opm_add_test: make it possible to hide disabled tests
the purpose is to make CI systems like travis happy because ctest
counts tests with status "(Not Run)" as failed and returns a non-zero
exit code.

hiding disabled ctests can be achived by adding the
-DADD_DISABLED_CTESTS=OFF cmake parameter.
2016-08-22 12:09:30 +02:00
Joakim Hove 3535a43382 Update cmake / jenkins / travis due to ert reorg. 2016-08-20 18:20:32 +02:00
Bård Skaflestad 34c4173dc3 Hook FD-Applications up to OPM build system
This commit recognizes the opm-flowdiagnostics-applications module
in OPM's centralised build system.  We make requisite changes to the
FIND support for module opm-flowdiagnostics (header 'tarjan.h' is
currently not public) and make a first cut at explicit prerequisites
for FD-Applications.
2016-08-17 12:25:20 +02:00
Kristian Hole-Drabløs c5f3c1eca1 Added commands for running regression test binaries 2016-07-19 09:52:29 +02:00
Joakim Hove 0d261d24f3 Update FindERTPython to check for EclSum. 2016-07-01 15:13:46 +02:00
Joakim Hove 7064cde08b Run Python / ERT based integration tests.
Added a new optional dependency the ERT Python distribution to
opm-simulators, and a cmake function 'opm_add_python_test' which can be
used to simplify integration tests of the type:

 1. Run flow on a model.
 2. Compare the results with a well known reference solution.
2016-06-29 20:03:26 +02:00
Joakim Hove 03b5b8e785 Updates to FindERTPython:
- Fixed bug: CMAKE_INSTALL_PREFIX -> CMAKE_PREFIX_PATH
 - Factored out path component ${PYTHON_INSTALL_PREFIX}
2016-06-28 11:28:05 +02:00
Joakim Hove 6d18022e19 FindERTPython will consider CMAKE_INSTALL_PREFIX. 2016-06-27 13:03:40 +02:00
Atgeirr Flø Rasmussen c753787c84 Merge pull request #147 from andlaus/remove_std_regex_test
FindCXX11Features.cmake: remove the test for `std::regex`
2016-06-23 07:34:24 +02:00
Joakim Hove 3e57bfd844 FindERT: look for ert_util C++ wrappers. 2016-06-22 16:12:35 +02:00
Andreas Lauser 1ea00e5602 FindCXX11Features.cmake: remove the test for std::regex
this test is quite fragile, takes relatively long and after
OPM/opm-parser#850 it is not required anymore.
2016-06-16 14:34:08 +02:00
Joakim Hove c089761bc9 Merge pull request #146 from jokva/remove-boost-dependencies-from-output
Remove boost dependencies from output except test
2016-06-14 10:35:34 +02:00
Arne Morten Kvarving 577088d80e Merge pull request #145 from jokva/new-find-opm-output
Change Find-output test source code
2016-06-13 15:57:33 +02:00
Jørgen Kvalsvik 5ad08b3843 Change Find-output test source code
opm-output is about to remove the OutputWriter.hpp header, which means
this test program will break. Wells.hpp and default-constructed
data::Rates is a better fit for the future.
2016-06-13 15:13:24 +02:00
Jørgen Kvalsvik c1e48b969c Remove boost dependencies from output except test 2016-06-13 14:44:22 +02:00
Arne Morten Kvarving 080a3ff687 fixed: set correct config variable 2016-06-13 10:44:01 +02:00
Joakim Hove 2ec97ba27f Merge pull request #127 from magnesj/vs2015-compile-fixes
VS2015 : Improvements to FIND functions for ERT and find_opm_package
2016-06-10 13:17:26 +02:00
Jørgen Kvalsvik 86a1d87a74 Swap opm-core/opm-output dependencies
Core depends on output, not the other way around.
2016-06-10 12:53:20 +02:00
Bård Skaflestad 0a0332d4e3 Recognize OPM-Flowdiagnostics as an OPM Module
This enables using the OPM build system in the new module

    opm-flowdiagnostics.
2016-06-08 16:59:52 +02:00
Magne Sjaastad 258476a196 VS2015 : Improvements to FIND functions for ERT and find_opm_package 2016-06-03 08:00:57 +02:00
Jørgen Kvalsvik 53151baf66 Fix typo in FindERT compile check 2016-05-27 13:33:49 +02:00
Jørgen Kvalsvik 1acba75552 FindERT uses new EclKW interface. 2016-05-27 10:29:41 +02:00
Magne Sjaastad f77866bf68 Added Visual Studio guards and fixed missing include 2016-05-24 15:02:36 +02:00
Atgeirr Flø Rasmussen 2da7093a35 Merge pull request #113 from andlaus/remove_legacy_alugrid_support
remove support for the legacy ALUGrid library from dune-grid
2016-05-23 15:16:26 +02:00
Andreas Lauser 33225a533a ewoms-prereqs.cmake: make the optionaly depency on opm-parser explicit
this allows to remove the opm-parser dependency of opm-core without
breaking ewoms/ebos...
2016-05-17 12:32:31 +02:00
Arne Morten Kvarving ea86d58ea5 Merge pull request #114 from andlaus/misc_fixes
Misc fixes
2016-05-11 13:53:56 +02:00
Robert Kloefkorn bead5d2e99 Added -pthread by default if threads are found. USE_PTHREAD is ON and can be turned OFF
to disable this feature.
2016-05-10 11:19:53 +02:00
Andreas Lauser c3cfe38f0c prevent cmake from warning about CMP0054
we set that policy to NEW because the old behavior is simply insane
for the sake of "convenience" (IMO).
2016-05-05 20:12:57 +02:00
Andreas Lauser 74ed9172bb FindSuperLU: make sure that the "SUPERLU_FOUND" variable is always set
I ran into problems (syntax errors in if statements) if that module
bailed out before find_package_handle_standard_args() was
invoked. Since OPM/ewoms#54 this happened e.g. on systems where no
BLAS library is installed.
2016-05-05 20:09:06 +02:00
Andreas Lauser 5d733a600c remove support for the legacy ALUGrid library from dune-grid
Considering the fact that this library has been on life support within
dune-grid since the alugrid development moved to the dune-alugrid
module -- which is available since at least dune 2.3 --, I doubt that
this was very useful and possibly it is even broken.
2016-05-04 13:53:39 +02:00