OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
413 Commits 18 Branches 75 Tags
ec63c6b7fd9adb21abc2c182ae0e2a7c8b0ddac1
Commit Graph
413 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Atgeirr Flø Rasmussen f998f52d61 Merge pull request #184 from akva2/use_cmake_cxx11 
added: use cmake mechanisms to enable c++11 with cmake >= 3.1
 2016-10-18 08:54:23 +02:00
Atgeirr Flø Rasmussen 3b22b584f3 Add OPM_THROW_NOLOG macro. 2016-10-17 13:02:50 +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
Arne Morten Kvarving 1216bc0525 Merge pull request #183 from akva2/update_packaging_devtoolset 
update redhat6 packaging
 2016-10-12 15:53:26 +02:00
Arne Morten Kvarving 924e4d6ad1 update redhat6 packaging 
build using devtoolset-3
 2016-10-12 14:07:46 +02:00
Arne Morten Kvarving d47816eb84 Merge pull request #182 from joakim-hove/update-find-output 
Update find output
 2016-10-12 11:47:59 +02:00
Joakim Hove 8bb00bc1e2 Updated Findopm-output to reflect repo changes. 2016-10-07 11:31:38 +02:00
Joakim Hove 69d0edc558 Merge pull request #181 from pgdr/add-findcwrap 
Added FindCwrap, add to pythonpath
 2016-10-05 14:14:26 +02:00
Pål Grønås Drange dac092dc8b Added FindCwrap, add to pythonpath 2016-10-04 12:57:38 +02:00
Atgeirr Flø Rasmussen e83fa6d066 Merge pull request #180 from akva2/update_petsc 
changed: update petsc module for newer petsc
 2016-09-29 16:50:44 +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
Atgeirr Flø Rasmussen dd52371189 Merge pull request #175 from blattms/allow-quiet-EclipsePRTLog 
Allow disabling output in EclipsePRTLog.
 2016-09-26 09:18:15 +02:00
Atgeirr Flø Rasmussen e7a047d53d Merge pull request #172 from atgeirr/use-map-for-simulationdatacontainer 
Use map instead of unordered_map.
 2016-09-22 18:40:05 +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
Arne Morten Kvarving 3d380cb395 Merge pull request #174 from akva2/change_name_and_fix_jenkins 
Change name of cmake variables and fix jenkins
 2016-09-20 17:37:04 +02:00