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

348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
43aa36e0f7 Merge pull request #168 from akva2/simplify_jenkins_after_ert_reorg 
simplify jenkins scripts after ert reorganization
 2016-08-22 17:28:51 +02:00
Arne Morten Kvarving
cbda0ae4a0 Merge pull request #165 from andlaus/travis_ewoms 
Travis ewoms
 2016-08-22 17:14:09 +02:00
Andreas Lauser
425f87b2e4 also ignore disabled ctests on jenkins 2016-08-22 14:52:01 +02:00
Arne Morten Kvarving
ab0dbee33d simplify jenkins scripts after ert reorganization 2016-08-22 12:12:24 +02:00
Andreas Lauser
b1cbd664d2 travis: add the -DADD_DISABLED_CTESTS=OFF and-DUSE_QUADMATH=OFF cmake flags 
ctest will return an error code if it encounters disabled tests
otherwise.
 2016-08-22 12:10:13 +02:00
Joakim Hove
547234a29c Added ewoms build to travis configuration. 2016-08-22 12:10:13 +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
e2fe88c739 Merge pull request #167 from joakim-hove/ert-repo-reorg 
Ert repo reorg
 2016-08-22 11:56:08 +02:00
Joakim Hove
3535a43382 Update cmake / jenkins / travis due to ert reorg. 2016-08-20 18:20:32 +02:00
Atgeirr Flø Rasmussen
e8e631ad3a Merge pull request #166 from bska/recognize-fd-appl 
Hook FD-Applications up to OPM build system
 2016-08-17 14:01:50 +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
Arne Morten Kvarving
bd425bfff9 Merge pull request #158 from kristfho/master 
Added CMake variable OPM_OUTPUT_BINARIES
 2016-07-21 16:27:20 +02:00
Kristian Hole-Drabløs
c5f3c1eca1 Added commands for running regression test binaries 2016-07-19 09:52:29 +02:00
jokva
7f1716b9a6 Merge pull request #157 from joakim-hove/travis-install-numpy 
Installing numpy using conda before building ert.
 2016-07-04 10:19:53 +02:00
Joakim Hove
47778333bc Installing numpy using conda before building ert. 2016-07-01 18:35:38 +02:00
Joakim Hove
06b18c1490 Merge pull request #156 from joakim-hove/findert-python-updates 
Findert python updates
 2016-07-01 16:33:37 +02:00
Joakim Hove
0d261d24f3 Update FindERTPython to check for EclSum. 2016-07-01 15:13:46 +02:00
Arne Morten Kvarving
fbc67f4ef9 Merge pull request #149 from joakim-hove/python-testing 
Run Python / ERT based integration tests.
 2016-06-30 13:20:58 +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
Arne Morten Kvarving
18ed6a2703 Merge pull request #151 from joakim-hove/jenkins-enable-python 
Enable Python in jenkins builder.
 2016-06-28 12:22:07 +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
a33f369e04 Enable Python in jenkins builder. 2016-06-27 16:49:21 +02:00
Joakim Hove
22dcb236ca Merge pull request #150 from joakim-hove/findert-python-cmake-prefix 
FindERTPython will consider CMAKE_INSTALL_PREFIX.
 2016-06-27 13:56:49 +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
Arne Morten Kvarving
25d582c19e Merge pull request #148 from joakim-hove/find-ert-utilxx 
FindERT: look for ert_util C++ wrappers.
 2016-06-22 17:55:12 +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
Atgeirr Flø Rasmussen
01c6f9fbc8 Merge pull request #142 from qilicun/minor-format-change 
use the 'msg + file name + line number' format.
 2016-06-15 14:20:28 +02:00
Liu Ming
8de9921890 file name and line number are in a new line. 2016-06-15 11:20:34 +08: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
Bård Skaflestad
e7db252f3e Merge pull request #144 from akva2/fix_output_config_var 
fixed: set correct config variable
 2016-06-13 12:37:35 +02:00
Arne Morten Kvarving
080a3ff687 fixed: set correct config variable 2016-06-13 10:44:01 +02:00
Liu Ming
eb654771d9 fix test issue. 2016-06-13 14:28:27 +08:00
Liu Ming
f9510e31a0 use the 'msg + file name + line number' format. 2016-06-13 13:46:51 +08:00
Joakim Hove
acad3a560e Merge pull request #141 from akva2/move_opm_output 
update jenkins build scripts
 2016-06-11 07:28:54 +02:00
Arne Morten Kvarving
3440258a72 update jenkins build scripts 
update build order, opm-output moved in the dependency tree
 2016-06-10 13:43:03 +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
Joakim Hove
eee539e6f1 Merge pull request #121 from jokva/opm-output-core-dependencies 
Swap opm-core/opm-output dependencies
 2016-06-10 13:15:11 +02:00
Jørgen Kvalsvik
e598210529 Travis builds output before core 
Since the edge between output and core in the dependency graph has been
inverted, build the two repositories in the right order.
 2016-06-10 12:53:56 +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
Joakim Hove
340f860c52 Merge pull request #140 from joakim-hove/fix-opm-clone 
travis/clone-opm.sh will never clone opm-common.
 2016-06-10 12:37:16 +02:00
Joakim Hove
3c4e995a75 travis/clone-opm.sh will never clone opm-common. 2016-06-10 11:46:22 +02:00
Pål Grønås Drange
70bfdc5061 Merge pull request #128 from joakim-hove/travis-build-downstream 
Script for travis to build and test downstream.
 2016-06-10 09:47:32 +02:00
Atgeirr Flø Rasmussen
2102160bd1 Merge pull request #137 from qilicun/set-default-prefix 
Make Error, Problem, Error, Warning with prefix by default.
 2016-06-10 08:43:46 +02:00
Atgeirr Flø Rasmussen
d69e33f677 Merge pull request #139 from joakim-hove/streamlog-append 
Log: StreamLog can optionally open in append mode.
 2016-06-10 07:11:21 +02:00
Joakim Hove
405a6c31c5 Log: StreamLog can optionally open in append mode. 2016-06-09 18:52:40 +02:00