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

388 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Markus Blatt
a9d105c1a0 Check for MPI 2 functionality and activate it for DUNE. 
This allow mixing the MPIHelper and MPI_Init/MPI_Finalize. This commit
makes OPM a bit more DUNE compatible.
 2016-09-16 18:17:19 +02:00
Markus Blatt
c0056ac4c8 Always initialize EclipsePRTLog::print_summary_ 2016-09-16 11:28:20 +02:00
Markus Blatt
644914ce5d Increase readability. 2016-09-16 09:57:20 +02:00
Markus Blatt
8eb2cead4d Document new stuff. 2016-09-16 09:50:19 +02:00
Markus Blatt
7da4e4a919 Resort to inherit StreamLog constructors in EclipsePRTLog. 
That way we will never miss a constructor. Before this commit
some of them were actually missing.
 2016-09-16 09:46:55 +02:00
Markus Blatt
64c0651ffa Allow disabling output in EclipsePRTLog. 
In a parallel run we need to be able to disable output in EclipsePRTLog
as only one process is allowed to output messages. This commit adds a
new defaulted constructor parameter to allow this.
 2016-09-15 21:22:21 +02:00
Arne Morten Kvarving
a32145c272 fixed: missed the passing of opm-data root for main module build 2016-09-14 14:57:18 +02:00
Kristian Hole-Drabløs
909a00fade Changed name of cmake variables 
Changed name of cmake variables due to namechange of binaries
 2016-09-14 12:03:37 +02:00
Atgeirr Flø Rasmussen
81a9f0521f Use map instead of unordered_map. 
This is because downstream code can benefit from the ordering guarantee.
 2016-09-07 13:37:09 +02:00
Atgeirr Flø Rasmussen
37938bbf5e Merge pull request #171 from bska/opm-fd-chase-api-update 
Update opm-flowdiagnostics system probe for API change
 2016-09-01 06:40:48 +02:00
Bård Skaflestad
29a1dcb6dc Update opm-flowdiagnostics system probe for API change 
This commit brings the system probe for module

    opm-flowdiagnostics

up-to-date with recent changes in the public interface of the
module's main entry point.  Commit OPM/opm-flowdiagnostics@8456e81
removed the nested type

    Opm::FlowDiagnostics::Toolbox::PoreVolume

so we must drop all references to this type.
 2016-08-31 22:07:46 +02:00
Arne Morten Kvarving
a802a5173b Merge pull request #170 from andlaus/fix_quadmath 
FindQuadmath.cmake: fix the first argument of find_package_handle_standard_args()
 2016-08-24 16:03:07 +02:00
Arne Morten Kvarving
688ded14c3 Merge pull request #169 from akva2/add_multiconfiguration 
Add multiconfiguration support to jenkins scripts
 2016-08-24 16:00:58 +02:00
Andreas Lauser
bf63963c0c FindQuadmath.cmake: fix the first argument of find_package_handle_standard_args() 
It needs to match the filename exacly, i.e. including the case.
 2016-08-24 14:56:08 +02:00
Arne Morten Kvarving
5e9e979051 add multiple build configuration support to jenkins scripts 
will be used for mpi-enabled builds

note options required for opm-parser, ewoms have been
moved to the build configurations for simpler maintenance.
 2016-08-24 14:46:49 +02:00
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