OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
519 Commits 18 Branches 75 Tags
0024fd9052e4974762bb3085b264eefada0dda0c
Commit Graph

519 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohith Nair
be3f1ed59b edited formatting 2017-04-04 10:01:13 +02:00
Rohith Nair
2313ab4029 Changed terminal output color for problem messages to magenta from red 2017-04-04 09:55:46 +02:00
Joakim Hove
554b5ff1b6 Merge pull request #232 from joakim-hove/findert-use-eclgrid 
Changed FindERT to create ecl_grid.
 2017-03-27 14:56:44 +02:00
Joakim Hove
98959d4a08 Changed FindERT to create ecl_grid. 2017-03-20 11:30:28 +01:00
Atgeirr Flø Rasmussen
f9311b96f3 Merge pull request #231 from atgeirr/refine-simple-logging 
Make setupSimpleDefaultLogging() more flexible.
 2017-03-20 08:08:04 +01:00
Atgeirr Flø Rasmussen
26974f28ef Make implementation of stdoutIsTerminal() more robust. 2017-03-17 15:40:02 +01:00
Atgeirr Flø Rasmussen
e0105c6ccf Merge pull request #205 from GitPaean/adding_Wcast_qual_warning_flag 
adding -Wcast-qual to disable_warnings.h
 2017-03-17 15:35:49 +01:00
Atgeirr Flø Rasmussen
7462cc4b96 Only use color coding for simple log setup if terminal. 
Note that isatty() might need to be replaced by isatty_() for Windows.
 2017-03-17 08:46:50 +01:00
Atgeirr Flø Rasmussen
726496c0b6 Make setupSimpleDefaultLogging() more flexible. 
Also added documentation for the function.
 2017-03-16 12:56:34 +01:00
Andreas Lauser
f979d1942f Merge pull request #230 from akva2/travis_enable_bc 
fixed: install bc on travis builder
 2017-03-10 15:03:38 +01:00
Arne Morten Kvarving
59319936e0 fixed: install bc on travis builder 
required by some scripts
 2017-03-10 13:52:53 +01:00
Atgeirr Flø Rasmussen
afc5903dfa Merge pull request #229 from akva2/remove_libtool 
remove libtool archive generation
 2017-02-23 15:26:51 +01:00
Arne Morten Kvarving
481d416c22 remove libtool archive generation 2017-02-23 14:13:49 +01:00
Atgeirr Flø Rasmussen
1788ecc1f0 Merge pull request #226 from andlaus/move_valgrind_crs 
move the infrastructure for valgrind client requests into the Opm namespace
 2017-02-10 10:22:14 +01:00
Andreas Lauser
52c05e6525 move the infrastructure for valgrind client requests into the Opm namespace 2017-02-09 18:26:31 +01:00
Atgeirr Flø Rasmussen
7222b210c7 Merge pull request #225 from akva2/automate_data_updates 
add script for automating data updates
 2017-01-26 13:50:44 +01:00
Arne Morten Kvarving
dcdb444050 add script for automating data updates 2017-01-26 11:51:45 +01:00
Pål Grønås Drange
7843964163 Merge pull request #224 from pgdr/message-status-for-opm-data 
status if opm-data found, not warning
 2017-01-12 09:30:51 +01:00
Pål Grønås Drange
8984579e77 status if opm-data found, not warning 2017-01-09 19:04:10 +01:00
Atgeirr Flø Rasmussen
1854c37b5b Merge pull request #223 from bska/update-fdappl-requirements 
Request Boost.Regex to Support FD-Application Acceptance Tests
 2017-01-09 16:58:17 +01:00
Bård Skaflestad
57fa257642 Request Boost.Regex to Support FD-Application Acceptance Tests 2017-01-09 15:52:19 +01:00
Atgeirr Flø Rasmussen
46144e814a Merge pull request #222 from andlaus/minor_reorg 
Minor reorg
 2016-12-14 21:45:50 +01:00
Andreas Lauser
3d096a54ec move over the code for valgrind client requests from opm-material 2016-12-14 16:47:41 +01:00
Atgeirr Flø Rasmussen
70bec15988 Merge pull request #221 from andlaus/reset_locale 
Provide a free function to reset the localization settings
 2016-12-08 12:01:23 +01:00
Andreas Lauser
f17880579c Provide a free function to reset the localization settings 
Under some circumstances, some environments seem to set a locale which
they do not install. In turn this leads to std::runtime_errror being
thrown by some parts of Boost (for some versions) which causes
unsolicited program aborts.

This issue asside, it looks pretty weird if the e.g. the number format
is different than the that of the language used to print stuff by rest
of the simulation.
 2016-12-07 14:04:32 +01:00
Arne Morten Kvarving
7b4bd58a82 Merge pull request #220 from akva2/fix_parallel_core_grid 
fixed: mpi and dune-istl needs to be explicity in opm-grid now
 2016-11-30 17:41:20 +01:00
Arne Morten Kvarving
aac2166cb8 fixed: mpi and dune-istl needs to be explicity in opm-grid now 
previously opm-core guaranteed these
 2016-11-30 15:55:24 +01:00
Arne Morten Kvarving
14efa7ed38 Merge pull request #218 from akva2/fix_test_program 
fix test program
 2016-11-30 00:46:12 +01:00
Arne Morten Kvarving
6f6801a5f2 look for opm/core/wells.h 
opm/core/grid.h is no more
 2016-11-29 23:57:16 +01:00
Arne Morten Kvarving
fa47d6a623 fix test program 2016-11-29 22:55:42 +01:00
Atgeirr Flø Rasmussen
29e12bfa79 Merge pull request #217 from akva2/update_downstreams_grid 
update downstream list
 2016-11-29 22:49:21 +01:00
Arne Morten Kvarving
d406e9f344 update travis build order 2016-11-29 22:07:41 +01:00
Arne Morten Kvarving
15583bdec6 update downstream list 
opm-grid move in dependency graph
 2016-11-29 21:36:07 +01:00
Atgeirr Flø Rasmussen
c15c3b6b9f Merge pull request #216 from atgeirr/revert-depencency-grid-core 
Revert depencency grid core
 2016-11-29 21:04:05 +01:00
Atgeirr Flø Rasmussen
bfeef48fbd Update test program to find opm-core. 
Used classes were moved to opm-grid.
 2016-11-29 13:19:56 +01:00
Atgeirr Flø Rasmussen
5a706c635e Merge branch 'PR/revert-dependency-grid-core' of https://github.com/dr-robertk/opm-common into dr-robertk-PR/revert-dependency-grid-core 2016-11-29 13:10:32 +01:00
Atgeirr Flø Rasmussen
bf656cd28f Merge pull request #213 from andlaus/move_Unused_hpp 
move the Unused.hpp file from opm-material to here
 2016-11-29 10:35:21 +01:00
Robert Kloefkorn
15f4d7e808 small change. 2016-11-24 13:24:42 +01:00
Robert Kloefkorn
264f621021 Revert dependencies of opm-core and opm-grid. opm-core is not dependent on 
opm-grid.
 2016-11-23 14:28:24 +01:00
Arne Morten Kvarving
35bd292fdf Merge pull request #214 from akva2/update_downstreams_ewoms 
update downstream list
 2016-11-22 16:03:51 +01:00
Andreas Lauser
5100db5694 move the Unused.hpp file from opm-material to here 2016-11-22 15:53:36 +01:00
Arne Morten Kvarving
fa3bba5510 update downstream list 
ewoms moved in the tree
 2016-11-22 15:21:35 +01:00
Atgeirr Flø Rasmussen
bbc8d23473 Merge pull request #210 from atgeirr/option-warnings-crossmodule 
Make use of system includes for cross-module optional.
 2016-11-21 13:22:32 +01:00
Atgeirr Flø Rasmussen
2ee1224917 Make use of system includes for cross-module optional. 2016-11-21 11:08:38 +01:00
Atgeirr Flø Rasmussen
2ddb6ac8c2 Merge pull request #162 from andlaus/frankenstein 
[POC] added ewoms dependency to opm-simulators.
 2016-11-18 15:49:35 +01:00
Robert Kloefkorn
825b96c1a3 added ewoms dependency to opm-simulators. 2016-11-17 17:41:42 +01:00
Andreas Lauser
8b3a4a6e23 Merge pull request #207 from blattms/fix-multiple-dune-version-request-hickups 
Request dune module versions only in the most upstream opm module.
 2016-11-17 17:38:26 +01:00
Markus Blatt
6608bc87e4 Request dune module versions only in the most upstream opm module. 
Otherwise we are running into weired problems as downstream modules
refuse to set the version information correctly. This leads to
unset DUNE_MODULE_VERSION_{MINOR,MAJOR,REVISION} in config.h.

This only happened for dune-istl which was first requested by opm-core
but that module did not set the version information. Opm-grid requested
it, too. But this time this information was not correctly put into
opm-grid-config.cmake leading to erroneous checks like:

if (DEFINED DUNE_ISTL_VERSION_MAJOR AND NOT "${DUNE_ISTL_VERSION_MAJOR}" STREQUAL "")
        message (WARNING "Incompatible value \"${DUNE_ISTL_VERSION_MAJOR}\" of variable \"DUNE_ISTL_VERSION_MAJOR\"")
endif ()

Note there should have been a number instead of an empty string. The version
numbers were also undefined in config.h of opm-grid. Same picture for opm-simulators.

My assumption is that for these modules Finddune-istl.cmake was implicitly included
when searching for opm-core. That module sets the version in the parent scope only
which might cause this problem. I am not sure though.

With this commit the version is always added to CONFIG_VARS for the first most upstream
OPM module that requests a dune module. This fixes the issue at least for me on my system.

Also note that this problem did not occur in all configurations. I experienced breaking
builds with the installed dune module 2.4.1 of Debian backports while using dunecontrol.
The warnings about unmatching versions happened with uninstalled 2.3, too.
 2016-11-17 17:01:33 +01:00
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