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

332 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arne Morten Kvarving
bf935bac89 Merge pull request #138 from bska/enable-opm-flowdiagnostics 
Recognize OPM-Flowdiagnostics as an OPM Module
 2016-06-09 11:51:55 +02:00
Liu Ming
213d4932a6 remove unused member data and fix initializing order. 2016-06-09 09:05:23 +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
Liu Ming
af9b0977f6 add two new constructors. 2016-06-08 15:30:52 +02:00
Liu Ming
46b7b2a114 fix test issues with prefix. 2016-06-08 13:52:40 +02:00
Liu Ming
e89bef777a fix prefix testing. 2016-06-08 13:40:19 +02:00
Liu Ming
752c8f3197 make Error, Warning, Bug, Problem with prefix by default. 2016-06-08 13:37:34 +02:00
Liu Ming
1a273ff6e3 make the first letter of prefix to be captial. 2016-06-08 13:35:05 +02:00
Atgeirr Flø Rasmussen
51d3ba1b66 Merge pull request #135 from qilicun/add-prtinfo-type 
Add prtinfo type
 2016-06-08 11:35:18 +02:00
Liu Ming
b4c9f82585 Let Note has its own prefix. 2016-06-08 10:55:38 +02:00
Liu Ming
2dce26c9f0 fix indentation and order. 2016-06-08 10:52:23 +02:00
Liu Ming
83db625173 change the message type order. 2016-06-08 09:12:19 +02:00
Liu Ming
aa51ea67bc change Prtinfo to Note. 2016-06-08 09:00:24 +02:00
Joakim Hove
422a11c6c7 Reorganized travis building. 
1. travis/build-prereqs.sh will build all the from-source dependencies;
    i.e. dune, superLU and ert.

 2. travis/clone-opm.sh will clone all opm modules, except the module
    given as commandline argument; it is assumed that travis has already
    fetched and merged the correct ref of this repo.

 3. travis/build-and-test.sh will build all upstream modules and then
    build and test the module given as commandline argument including
    all downstream modules:

       travis/build-and-test.sh  opm-output

With this the .travis.yml file can be nearly identical for each module,
e.g. for opm-output the before_script and script sections will be:

   before_script:
       - export CXX="g++-4.8" CC="gcc-4.8" FC="gfortran-4.8"
       - cd ..
       - opm-common/travis/build-prereqs.sh
       - opm-common/travis/clone-opm.sh opm-output

   script: opm-common/travis/build-and-test.sh opm-output
 2016-06-07 22:40:52 +02:00
Liu Ming
3573ab0181 fix indentation. 2016-06-07 14:16:25 +02:00
Liu Ming
314a3ffec7 Add a new message type that allows messages only go into print file. 2016-06-07 14:08:33 +02:00