OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
532 Commits 18 Branches 75 Tags
38e198d96144625f9fba01d241b2dd9782bfa2a2
Commit Graph

532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arne Morten Kvarving
35bd292fdf Merge pull request #214 from akva2/update_downstreams_ewoms 
update downstream list
 2016-11-22 16:03:51 +01:00
Andreas Lauser
5100db5694 move the Unused.hpp file from opm-material to here 2016-11-22 15:53:36 +01:00
Arne Morten Kvarving
fa3bba5510 update downstream list 
ewoms moved in the tree
 2016-11-22 15:21:35 +01:00
Atgeirr Flø Rasmussen
bbc8d23473 Merge pull request #210 from atgeirr/option-warnings-crossmodule 
Make use of system includes for cross-module optional.
 2016-11-21 13:22:32 +01:00
Atgeirr Flø Rasmussen
2ee1224917 Make use of system includes for cross-module optional. 2016-11-21 11:08:38 +01:00
Atgeirr Flø Rasmussen
2ddb6ac8c2 Merge pull request #162 from andlaus/frankenstein 
[POC] added ewoms dependency to opm-simulators.
 2016-11-18 15:49:35 +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
Atgeirr Flø Rasmussen
4398342048 Merge pull request #206 from joakim-hove/disable-ewoms-tests 
Disable ewoms tests
 2016-11-15 12:07:07 +01:00
Joakim Hove
c62f91154a Temporary measures to reduce build time on Travis. 
- The tests are disabled when building ewoms.
 - opm-upscaling is not built.
 2016-11-15 11:16:38 +01:00
Joakim Hove
00debb5e08 Use ON to silence external warnings. 2016-11-14 20:07:14 +01:00
Kai Bao
2724aae005 adding -Wcast-qual to disable_warnings.h 2016-11-14 18:05:41 +01:00
Arne Morten Kvarving
f48a647fc8 Merge pull request #204 from joakim-hove/travis-cleanup 
Remove unused travis scripts
 2016-11-14 09:49:34 +01:00
Joakim Hove
f6fb9d09c4 Removed unused travis scripts 2016-11-13 08:26:57 +01:00
Andreas Lauser
bb1040df70 Merge pull request #201 from andlaus/check_for_valgrind_in_opm-material 
opm-material: actually check for valgrind
 2016-11-08 11:42:35 +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
Atgeirr Flø Rasmussen
1c5a17b6e8 Merge pull request #200 from atgeirr/bump-version 
dune.module: change version to 2017.04-pre
 2016-11-04 12:30:26 +01:00
Atgeirr Flø Rasmussen
596bafb2e7 dune.module: change version to 2017.04-pre 2016-11-04 12:26:59 +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
Arne Morten Kvarving
b4fd17e9a7 Merge pull request #199 from blattms/support-external-cjson 
Support external cjson
 2016-11-03 11:51:02 +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
Arne Morten Kvarving
4696486879 Merge pull request #198 from akva2/jenkins_build_threads 
added: allow building with multiple threads in jenkins scripts
 2016-11-02 15:51:39 +01:00
Arne Morten Kvarving
e0a146708c added: allow building with multiple threads in jenkins scripts 
use the BUILDTHREADS environment variable

convenient for local use
 2016-11-02 15:46:30 +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
Atgeirr Flø Rasmussen
4947c64556 Merge pull request #192 from qilicun/fix-error-summary 
Correct error summary category.
 2016-10-21 11:04:45 +02:00
Atgeirr Flø Rasmussen
7226f67e0d Merge pull request #188 from dr-robertk/PR/fix-istl-dependency-opm-grid 
[bugfix] since HAVE_DUNE_ISTL is used in opm-grid it should be tested for.
 2016-10-21 11:00:11 +02:00
Liu Ming
cc0dc95de6 correct error summary category. 2016-10-20 20:58:04 +08:00
Atgeirr Flø Rasmussen
46c1dfe3b4 Merge pull request #186 from qilicun/messages-limits 
Support category limits setting.
 2016-10-20 09:22:28 +02:00
Liu Ming
a4f4578dc1 Merge pull request #1 from atgeirr/qilicun-messages-limits 
Revised message limits work
 2016-10-20 09:02:53 +08:00
Atgeirr Flø Rasmussen
0283536ac4 Finish revision of logging. 2016-10-19 15:08:46 +02:00
Atgeirr Flø Rasmussen
35514c0aa0 Improve MessageLimiter class. 2016-10-19 13:11:13 +02:00
Atgeirr Flø Rasmussen
68311cf5b3 Merge branch 'messages-limits' of https://github.com/qilicun/opm-common into qilicun-messages-limits 2016-10-19 10:58:26 +02: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
bd52696fc2 Merge pull request #187 from akva2/fix_cxx11_opm_grid 
fixed: turns out skipping the (unnecessary) c++11 tests cause issues
 2016-10-18 15:40:01 +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
Liu Ming
9020c7cb36 Support category limits setting. 2016-10-18 19:26:06 +08:00
Atgeirr Flø Rasmussen
c32693f44c Merge pull request #185 from atgeirr/add-nolog-throw 
Add OPM_THROW_NOLOG macro.
 2016-10-18 08:55:25 +02:00