Commit Graph

190 Commits

Author SHA1 Message Date
Joakim Hove
d1a3e4a872 Change ert -> libecl
- The travis build will use Statoi/libecl
 - The FindERT cmake module has been updated to look for both ert/ and
   libecl/
2017-04-18 20:32:02 +02:00
Atgeirr Flø Rasmussen
176d0b188e Merge pull request #194 from blattms/support-c++14-for-dune-2.5
dune 2.5 support
2017-04-07 21:02:12 +02:00
Joakim Hove
98959d4a08 Changed FindERT to create ecl_grid. 2017-03-20 11:30:28 +01:00
Arne Morten Kvarving
481d416c22 remove libtool archive generation 2017-02-23 14:13:49 +01:00
Pål Grønås Drange
8984579e77 status if opm-data found, not warning 2017-01-09 19:04:10 +01:00
Bård Skaflestad
57fa257642 Request Boost.Regex to Support FD-Application Acceptance Tests 2017-01-09 15:52:19 +01:00
Arne Morten Kvarving
aac2166cb8 fixed: mpi and dune-istl needs to be explicity in opm-grid now
previously opm-core guaranteed these
2016-11-30 15:55:24 +01:00
Arne Morten Kvarving
6f6801a5f2 look for opm/core/wells.h
opm/core/grid.h is no more
2016-11-29 23:57:16 +01:00
Arne Morten Kvarving
fa47d6a623 fix test program 2016-11-29 22:55:42 +01:00
Atgeirr Flø Rasmussen
c15c3b6b9f Merge pull request #216 from atgeirr/revert-depencency-grid-core
Revert depencency grid core
2016-11-29 21:04:05 +01:00
Atgeirr Flø Rasmussen
bfeef48fbd Update test program to find opm-core.
Used classes were moved to opm-grid.
2016-11-29 13:19:56 +01:00
Atgeirr Flø Rasmussen
5a706c635e Merge branch 'PR/revert-dependency-grid-core' of https://github.com/dr-robertk/opm-common into dr-robertk-PR/revert-dependency-grid-core 2016-11-29 13:10:32 +01:00
Robert Kloefkorn
15f4d7e808 small change. 2016-11-24 13:24:42 +01:00
Robert Kloefkorn
264f621021 Revert dependencies of opm-core and opm-grid. opm-core is not dependent on
opm-grid.
2016-11-23 14:28:24 +01:00
Andreas Lauser
5100db5694 move the Unused.hpp file from opm-material to here 2016-11-22 15:53:36 +01:00
Atgeirr Flø Rasmussen
2ee1224917 Make use of system includes for cross-module optional. 2016-11-21 11:08:38 +01:00
Robert Kloefkorn
825b96c1a3 added ewoms dependency to opm-simulators. 2016-11-17 17:41:42 +01:00
Andreas Lauser
8b3a4a6e23 Merge pull request #207 from blattms/fix-multiple-dune-version-request-hickups
Request dune module versions only in the most upstream opm module.
2016-11-17 17:38:26 +01:00
Markus Blatt
6608bc87e4 Request dune module versions only in the most upstream opm module.
Otherwise we are running into weired problems as downstream modules
refuse to set the version information correctly. This leads to
unset DUNE_MODULE_VERSION_{MINOR,MAJOR,REVISION} in config.h.

This only happened for dune-istl which was first requested by opm-core
but that module did not set the version information. Opm-grid requested
it, too. But this time this information was not correctly put into
opm-grid-config.cmake leading to erroneous checks like:

if (DEFINED DUNE_ISTL_VERSION_MAJOR AND NOT "${DUNE_ISTL_VERSION_MAJOR}" STREQUAL "")
        message (WARNING "Incompatible value \"${DUNE_ISTL_VERSION_MAJOR}\" of variable \"DUNE_ISTL_VERSION_MAJOR\"")
endif ()

Note there should have been a number instead of an empty string. The version
numbers were also undefined in config.h of opm-grid. Same picture for opm-simulators.

My assumption is that for these modules Finddune-istl.cmake was implicitly included
when searching for opm-core. That module sets the version in the parent scope only
which might cause this problem. I am not sure though.

With this commit the version is always added to CONFIG_VARS for the first most upstream
OPM module that requests a dune module. This fixes the issue at least for me on my system.

Also note that this problem did not occur in all configurations. I experienced breaking
builds with the installed dune module 2.4.1 of Debian backports while using dunecontrol.
The warnings about unmatching versions happened with uninstalled 2.3, too.
2016-11-17 17:01:33 +01:00
Atgeirr Flø Rasmussen
ec63c6b7fd Merge pull request #202 from atgeirr/warnings-fix
Silence warnings not from current module.
2016-11-16 10:14:46 +01:00
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
Atgeirr Flø Rasmussen
5344392b99 Silence warnings not from current module. 2016-11-08 10:46:35 +01:00
Markus Blatt
ebe3457064 Correctly use -std=c++<version> instead of -std=<version> with older CMake. 2016-11-04 16:25:32 +01:00
Markus Blatt
dbad03c62f Correctly request compiler flags for feature tests 2016-11-03 12:09:10 +01:00
Markus Blatt
2ce0810f68 Readded lost ) 2016-11-03 12:05:58 +01:00
Markus Blatt
69da5816d6 Make c++14 available for CMake >=3.1 and do not test c++0x 2016-11-03 12:00:11 +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
Markus Blatt
1352e89d4e Make dune-grid compile test more generic 2016-10-26 13:42:42 +00:00
Markus Blatt
b46d3df2f7 Find dune-grid 2.5 2016-10-26 13:19:40 +00:00
Markus Blatt
4d31c7efdc Activate -std=c++14 switch if compiler supports it.
This is needed to make OPM compile with 2.5. Otherwise dune-common
is not found because of missing std::decay_t support.
2016-10-25 09:41:29 +00: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