Commit Graph

356 Commits

Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
1278e431ae Merge pull request #134 from qilicun/set-color
change yellow to blue.
2016-06-06 15:34:11 +02:00
Liu Ming
199324363b fix color test. 2016-06-06 15:29:09 +02:00
Liu Ming
908acdcb74 add yellow back and change warning color as blue. 2016-06-06 15:11:32 +02:00
Liu Ming
099099d87c change yellow to blue. 2016-06-06 14:56:29 +02:00
Atgeirr Flø Rasmussen
ef6dea7b8d Merge pull request #131 from qilicun/useful-types
Define one useful message type.
2016-06-06 12:28:28 +02:00
Liu Ming
9683fe2b95 Define one useful message type. 2016-06-06 11:52:57 +02:00
Magne Sjaastad
258476a196 VS2015 : Improvements to FIND functions for ERT and find_opm_package 2016-06-03 08:00:57 +02:00
Joakim Hove
82b638b429 Merge pull request #126 from jokva/ert-ecl-kw-bugfix
Fix typo in FindERT compile check
2016-05-27 13:35:31 +02:00
Jørgen Kvalsvik
53151baf66 Fix typo in FindERT compile check 2016-05-27 13:33:49 +02:00
Joakim Hove
da4923b5bb Merge pull request #125 from jokva/find-ert-new-eclkw
FindERT uses new EclKW interface.
2016-05-27 13:19:06 +02:00
Atgeirr Flø Rasmussen
c91cd7c8c1 Merge pull request #124 from atgeirr/simplify-colorization
No longer emit default Ansi color code for black.
2016-05-27 13:14:59 +02:00
Jørgen Kvalsvik
1acba75552 FindERT uses new EclKW interface. 2016-05-27 10:29:41 +02:00
Atgeirr Flø Rasmussen
c4eb8936a8 No longer emit default Ansi color code for black.
Using no code for black makes it easier to read output with color in editors etc.
2016-05-25 13:56:33 +02:00
Arne Morten Kvarving
5f9fc9bf5b Merge pull request #123 from magnesj/vs2015-compile-fixes
Added Visual Studio guards and fixed missing include
2016-05-25 11:07:49 +02:00
Magne Sjaastad
f77866bf68 Added Visual Studio guards and fixed missing include 2016-05-24 15:02:36 +02:00
Atgeirr Flø Rasmussen
2da7093a35 Merge pull request #113 from andlaus/remove_legacy_alugrid_support
remove support for the legacy ALUGrid library from dune-grid
2016-05-23 15:16:26 +02:00
Atgeirr Flø Rasmussen
e73db36f82 Merge pull request #122 from qilicun/setup-simple-log
Add default simple logging.
2016-05-23 09:41:12 +02:00
Liu Ming
9aba3ac6b3 fix type error. 2016-05-23 15:04:41 +08:00
Liu Ming
a5afe90659 add simple test for OpmLog::setupSimpleDefaultLog. 2016-05-23 15:01:50 +08:00
Liu Ming
77a3df1a61 pass value not reference. 2016-05-23 15:01:28 +08:00
Liu Ming
367a9f9a0c Add default simple logging. 2016-05-23 10:12:29 +08:00
Joakim Hove
36d959f1f5 Merge pull request #119 from atgeirr/message-limits
Message limits and tagged messages
2016-05-19 10:23:46 +02:00
Atgeirr Flø Rasmussen
c4c1fe2b30 Rename methods according to code review. 2016-05-18 22:22:10 +02:00
Atgeirr Flø Rasmussen
f1a1aa02fb Simplify Logger methods. 2016-05-18 22:21:56 +02:00
Atgeirr Flø Rasmussen
d2564ff838 Support tagged messages.
This changes the design of the LogBackend class and its subclasses,
now the main virtual method is addTaggedMessage(). The former virtual
method addMessage() is now a regular non-virtual method forwarding to
addTaggedMessage().

You can configure message limiting based on tags by passing a MessageLimiter
to the configureMessageLimiter() method, which will then be used by the
includeMessage() method. That method now takes an additional tag argument.

The most user-visible part of this is that there are new overloads of the
static methods OpmLog::warning(), OpmLog::error() etc, that take message
tags. To tie things together the OpmLog and Logger classes have also gotten
new addTaggedMessage() methods, but they should mostly be used through the
convenience methods such as OpmLog::warning().
2016-05-18 13:27:12 +02:00
Atgeirr Flø Rasmussen
9c84967734 Add MessageLimiter class and test. 2016-05-18 12:11:26 +02:00