OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,618 Commits 9 Branches 35 Tags
19e5d5cea289b4e131ce2fd9b5c6a0d25037d149
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 1d61208d88 Merge pull request #357 from andlaus/test_std_is_integral 
C++-11 Features: add test for std::is_integral
 2013-09-05 02:01:05 -07:00
Bård Skaflestad 0b9834be56 Merge pull request #331 from rolk/331_sync 
Provide protocol for exchanging state with client
 2013-08-30 07:41:14 -07:00
Bård Skaflestad 76a7cba75e Merge pull request #351 from rolk/351_cxx 
Alternate compiler cannot be set with environment variables
 2013-08-28 04:10:39 -07:00
Bård Skaflestad cf90e27830 Merge pull request #350 from rolk/350_dunemod 
Dune.module is searched for in the wrong directory
 2013-08-28 03:53:08 -07:00
Bård Skaflestad d5f36f14ac Merge pull request #349 from rolk/349_ertver 
Test ERT for a newer API level
 2013-08-27 07:36:08 -07:00
Bård Skaflestad 74380b0964 Merge pull request #335 from rolk/335_multiver 
Support multi-versioned installation
 2013-08-26 06:08:36 -07:00
Bård Skaflestad 8b98840a72 Merge pull request #346 from andlaus/fix_superlu_and_quadmath 
Fix superlu and quadmath
 2013-08-26 06:07:22 -07:00
Bård Skaflestad 0522184cfb Merge pull request #334 from rolk/334_macver 
Support configuration on MacOS X using Apple toolchain
 2013-08-26 06:05:38 -07:00
Bård Skaflestad 3c465de5be Merge pull request #340 from rolk/340_suitesparse 
Remove subdirectory from SuiteSparse include
 2013-08-26 06:04:21 -07:00
Bård Skaflestad 5edf6be8aa Merge pull request #342 from rolk/342_signals 
Provide event mechanism using C++11 instead of Boost::Signals
 2013-08-26 05:59:32 -07:00
Bård Skaflestad 372ed60f3c Merge pull request #339 from andlaus/alugrid_parallel_found_no_list 
avoid to make ALUGRID_PARALLEL_FOUND a list
 2013-08-26 04:22:14 -07:00
Bård Skaflestad 1d28905cb1 Merge pull request #341 from rolk/341_known 
Mark known feature variables as used
 2013-08-26 04:17:15 -07:00
Bård Skaflestad e9ac0eaade Merge pull request #343 from andlaus/ewoms_add_opm_material 
add opm-material to the eWoms prerequisites
 2013-08-26 04:09:27 -07:00
Bård Skaflestad 0c03c6e733 Merge pull request #329 from andlaus/unquoted_config_vars 
cmake: support defining unquoted variables for config.h
 2013-08-26 03:25:11 -07:00
Bård Skaflestad 889f8d7e49 Merge pull request #337 from rolk/337_boost 
Fix prerequisite Boost components across modules
 2013-08-23 15:37:19 -07:00
Bård Skaflestad 089e755735 Merge pull request #330 from rolk/330_underscore 
Simplify creation of Fortran function wrappers
 2013-08-23 11:43:48 -07:00
Bård Skaflestad 7b882ceaca Merge pull request #328 from rolk/328_warn 
Issue a CMake warning if client project is incompatible
 2013-08-21 13:03:53 -07:00
Bård Skaflestad 6f4e663346 Merge pull request #325 from rolk/325_eigen 
Make probe for Eigen3 part of the common build system
 2013-08-21 09:46:18 -07:00
Bård Skaflestad 259ec164d4 Merge pull request #324 from rolk/324_alugrid 
Only require METIS if ALUGrid is built for parallel
 2013-08-21 09:26:16 -07:00
Bård Skaflestad 0bd1ae2ec5 Merge pull request #327 from rolk/327_disable 
Don't search for disabled packages
 2013-08-21 09:14:50 -07:00
Bård Skaflestad 20241ebfd3 Merge pull request #323 from rolk/323_case 
Allow found-variable to be named as package
 2013-08-19 14:54:17 -07:00
Bård Skaflestad 14b2d65319 Merge pull request #322 from rolk/322_req 
Propagate "requiredness" to prerequisites depending on the package's level
 2013-08-17 05:45:14 -07:00
Bård Skaflestad ed3552cfb5 Merge pull request #319 from rolk/319_confvar 
Trim unnecessary config.h defines from prerequisite list
 2013-08-17 05:37:35 -07:00
Bård Skaflestad cf07c2d8ed Merge pull request #320 from rolk/320_build 
Put in hooks to change build directory later
 2013-08-16 03:31:02 -07:00
Bård Skaflestad 849e2618a4 Merge pull request #317 from andlaus/cmake_improvements 
Cmake improvements
 2013-08-16 03:29:46 -07:00
Bård Skaflestad 65e0b36724 Merge pull request #318 from rolk/318_gridver 
Publicly depend on version of dune-grid
 2013-08-14 05:30:45 -07:00
Bård Skaflestad 9b313c2d2e Merge pull request #314 from rolk/314_agmg 
Remove support for AGMG
 2013-08-14 01:40:39 -07:00
Bård Skaflestad c50b62fe5a Merge pull request #308 from rolk/308_agmg 
Resurrect support for AGMG library

This is an interim milestone that may serve as point from which to 
resurrect the AGMG suppert fully if the AGMG author ever decides to 
re-release the software under an open licence.
 2013-08-13 14:17:38 -07:00
Bård Skaflestad d13054e4e2 Merge pull request #313 from andlaus/use_std_shared_ptr 
Use std shared ptr
 2013-08-13 01:22:34 -07:00
Bård Skaflestad 876fa56489 Merge pull request #316 from rolk/316_material 
OPM Porsol now depends on OPM Material
 2013-08-12 01:54:44 -07:00
Bård Skaflestad ca44960c5e Merge pull request #298 from rolk/298_dunever 
Make version numbers for DUNE prerequisites available
 2013-08-08 04:10:25 -07:00
Bård Skaflestad 65dc3224b0 Merge pull request #312 from rolk/312_nolib 
Allow several options to be used even if we don't have a library
 2013-08-08 01:22:16 -07:00
Bård Skaflestad 07dcca3917 Merge pull request #311 from rolk/311_material 
Find module for opm-material
 2013-08-08 00:40:26 -07:00
Bård Skaflestad 8e63169073 Merge pull request #310 from andlaus/allow-nolib 
Build system: make it work for modules which do not need libraries
 2013-08-07 08:12:47 -07:00
Bård Skaflestad d67f0c74d4 Merge pull request #309 from rolk/309_clean 
Have distclean target keep up with build improvements
 2013-08-07 01:20:36 -07:00
Bård Skaflestad 273d70bebb Merge pull request #307 from rolk/307_clang 
Recognize Clang to be a GCC-compatible compiler
 2013-08-06 14:25:16 -07:00
Bård Skaflestad 1168d19b43 Merge pull request #306 from rolk/306_ninja 
Enable support for Ninja build generator
 2013-08-06 13:48:05 -07:00
Bård Skaflestad 4557625b04 Merge pull request #305 from rolk/305_openmp 
Provide a define for having OpenMP
 2013-08-06 12:54:51 -07:00
Bård Skaflestad 4a4f7c379f Merge pull request #303 from rolk/303_libless 
Add support to the build system for building header-only modulesi
 2013-08-02 14:47:38 -07:00
Bård Skaflestad f0d6a2e1c5 Merge pull request #302 from rolk/302_attic 
Put old "non-unit-tests" in the attic instead
 2013-08-02 14:34:21 -07:00
Bård Skaflestad dcc0d6ff3b Merge pull request #301 from rolk/301_verteq 
Add find module for opm-verteq to build system
 2013-08-02 14:22:42 -07:00
Bård Skaflestad 53dab38e31 Merge pull request #297 from rolk/297_version 
Make version number available to client code
 2013-08-02 10:32:50 -07:00
Bård Skaflestad dc859e30ac Merge pull request #300 from rolk/300_precomp 
Further classify source files into languages

Needed, for instance, to properly assign derived properties to a subset
of the sources.  
  
This feature is used in the PCH module (UsePrecompHeaders.cmake)
 2013-08-02 09:53:28 -07:00
Bård Skaflestad 900a21adb3 Merge pull request #296 from rolk/296_runpath 
Embed original dependency paths in installed library
 2013-08-01 09:36:54 -07:00
Bård Skaflestad 92fca433be Merge pull request #294 from rolk/294_unittests 
Fix non-unit tests so they compile again
 2013-08-01 03:36:10 -07:00
Bård Skaflestad e9b5a55b4b Merge pull request #293 from rolk/293_wogit 
Make project buildable also without Git
 2013-07-31 06:37:12 -07:00
Bård Skaflestad 0e42c0e20c Merge pull request #292 from rolk/292_fastbuild 
Add possibility to skip building tests and examples
 2013-07-31 05:45:47 -07:00
Bård Skaflestad 93afe5fbb6 Merge pull request #291 from rolk/291_ertdep 
Probe again later if ERT isn't found now
 2013-07-31 05:19:47 -07:00
Bård Skaflestad 3e803a4780 Merge pull request #290 from rolk/290_version 
Embed version string into the library
 2013-07-31 04:57:55 -07:00
Bård Skaflestad 1967631b83 Merge pull request #285 from rolk/285_shadow 
Provide way of shadowing only some properties
 2013-07-31 04:05:13 -07:00
Bård Skaflestad 2dac509c97 Merge pull request #289 from andlaus/make-gcc44-mandatory 
Make gcc44 mandatory
 2013-07-30 13:25:35 -07:00
Bård Skaflestad 6d3cbafa54 Merge pull request #288 from andlaus/fix-clang-warnings 
fix a few CLang warnings
 2013-07-30 12:18:54 -07:00
Bård Skaflestad 0023e508e1 Merge pull request #286 from joakim-hove/save-eclgrid-after-deactivating-cells 
Changed EclipseGridParser::saveEGRID() to take globalCells input
 2013-07-30 07:06:52 -07:00
Bård Skaflestad 054b764224 Merge pull request #287 from rolk/286_info 
Read project settings from dune.module
 2013-07-30 06:27:08 -07:00
Bård Skaflestad efc44daf76 Merge pull request #278 from rolk/278_linkver 
Print linker version to log when configuring
 2013-07-05 04:25:50 -07:00
Bård Skaflestad 94bc2525b2 Merge pull request #277 from blattms/fix-agmg-verbosity 
Fixes setting the verbosity for AGMG.
 2013-07-05 03:41:58 -07:00
Bård Skaflestad 8fc205707b Merge pull request #276 from rolk/276_linsolres 
Zero-initialize structure to avoid returning undefined
 2013-07-05 02:36:57 -07:00
Bård Skaflestad 143417e2b2 Merge pull request #272 from blattms/satellite-exclude-all 
Change marker EXCLUDE_ALL to EXCLUDE_FROM_ALL in opm_compile_satellite
 2013-07-05 02:24:58 -07:00
Bård Skaflestad 33173396f5 Merge pull request #266 from rolk/266_library 
Move all common build code to cmake/ directory
 2013-07-05 01:28:55 -07:00
Bård Skaflestad d332129676 Merge pull request #274 from blattms/non-tr1 
Changed std::tr1 occurences to boost.
 2013-07-04 12:01:51 -07:00
Bård Skaflestad d3065fb3f6 Merge pull request #269 from rolk/269_sink 
Use a more realistic measure for source and show use of units
 2013-06-28 04:56:36 -07:00
Bård Skaflestad 254f70e504 Merge pull request #267 from laods/verbosity 
Change verbosity level of warning message in transport solver
 2013-06-28 02:02:31 -07:00
Bård Skaflestad c737a1b01b Remove files that were inadvertenly introduced 
Requested by: qilicun
 2013-06-25 11:33:23 +02:00
Bård Skaflestad 6afd914756 Merge pull request #262 from blattms/unify-amg-calls 
Unify amg calls
 2013-06-21 04:01:03 -07:00
Bård Skaflestad 33320270fc Disable build kluge that is no longer pertinent 
The <have_boost_redef.hpp> header was introduced (commit 82369f9) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules.  Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems.  Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always

  #define HAVE_BOOST 1

i.e., as an explict true/false value.

Therefore, we need no longer include <have_boost_redef.hpp> .  The
header will be removed at a later time.
 2013-06-20 23:14:39 +02:00
Bård Skaflestad 2b4298f366 Merge pull request #261 from rolk/261_parse 
Sideport of OPM/opm-material@48f6d4d to opm-core
 2013-06-20 04:55:27 -07:00
Bård Skaflestad e3577085c2 Add CMake backwards compatibility for version < 2.8.3 
Add features that aren't available in early versions of the 2.8.x
release series, enabling use of 2.8.0 if needed (e.g. Ubuntu 10.04)
 2013-06-20 13:30:57 +02:00
Bård Skaflestad 79b180976f Merge pull request #260 from rolk/260_auto 
Sideport of OPM/opm-material@7298744 to opm-core
 2013-06-20 04:27:49 -07:00
Bård Skaflestad 4273ce4dd3 Merge pull request #259 from rolk/259_withwarn 
Recognize lib dirs that may be used later
 2013-06-17 04:54:55 -07:00
Bård Skaflestad 2c85189c6c Merge pull request #258 from rolk/258_nolto 
Disable link-time, whole program optimization
 2013-06-14 01:10:56 -07:00
Bård Skaflestad 28406d287d Include flag for enabling link-time optimizations 
When LTO is disabled by default, we need a flag to re-enable it.
 2013-06-14 08:54:32 +02:00
Bård Skaflestad 5cf50de0c5 Merge pull request #254 from totto82/newfluid2 
A test for the blackoil fluid based on the [p,r] interface
 2013-06-10 06:50:37 -07:00
Bård Skaflestad 1b3670084f Merge pull request #255 from rolk/255_repo 
Use science repo on SuSE, recommend ERT on Debian
 2013-06-06 03:26:58 -07:00
Bård Skaflestad f5d67fafc8 Favour std::vector<> over variably-sized arrays. 
Variably-sized arrays of the form

   int n = 6;
   double a[n];

are an extension to the language that will illicit a suitably
persnickety diagnostic from GCC when invoked with "-pedantic".
 2013-06-05 17:14:33 +02:00
Bård Skaflestad 61caec19d4 Merge pull request #248 from rolk/248_m4 
Replace remnants of original autotools config with m4 that imports the CMake config
 2013-06-05 07:43:13 -07:00
Bård Skaflestad f16b9f10e7 Mark deck as FIELD units. 
The numbers in the deck are more indicative of FIELD unit conventions
than METRIC unit conventions, so allow the input parser to interpret
the data in that manner.
 2013-06-05 12:24:23 +02:00
Bård Skaflestad fdf8a0ddcb Indent lists using <tab> rather than <space>. 
This is the convention used throughout the .cmake files of OPM-Core.
 2013-06-05 12:18:21 +02:00
Bård Skaflestad 278a054019 Don't build/run "test_newfluidinterface.cpp" during "make test" 
The executable is not written as a unit test (e.g., using Boost.Test)
and furthermore requires external data (in a very specific location).
This makes it inappropriate for use during "make test", but it could
(and should) be cleaned up and incorporated into the test portfolio at
a later time.
 2013-06-03 17:07:53 +02:00
Bård Skaflestad f4588ff7b4 Merge remote-tracking branch 'upstream/master' 2013-06-03 17:05:04 +02:00
Bård Skaflestad 32091a5fc7 Merge pull request #251 from atgeirr/rockcomp 
Add transMult(), poroMultDeriv() and transMultDeriv() to RockCompressibility.
 2013-06-03 07:58:14 -07:00
Bård Skaflestad 7a7787f05c Merge remote-tracking branch 'upstream/master' 2013-06-03 09:59:19 +02:00
Bård Skaflestad 481c3a4e00 Merge pull request #250 from atgeirr/combined 
A collection of various updates
 2013-06-03 00:58:50 -07:00
Bård Skaflestad cadd324192 Merge remote-tracking branch 'upstream/master' 2013-06-03 09:33:58 +02:00
Bård Skaflestad 894bb5e072 Merge remote-tracking branch 'upstream/master' 2013-05-24 00:44:01 +02:00
Bård Skaflestad 628c162574 Merge from upstream 2013-05-23 09:50:46 +02:00
Bård Skaflestad 9401a482d6 Merge pull request #244 from atgeirr/add-phaseusage-to-interface 
Add phaseUsage() to BlackoilPropertiesInterface
 2013-05-16 02:21:11 -07:00
Bård Skaflestad 7add6048cc Merge pull request #240 from atgeirr/tof-improvements 
Ensure (average of) tracers sum to one for DG1.
 2013-05-14 02:28:21 -07:00
Bård Skaflestad 53b082af28 Always interpret 'ref_pressure' as a double 
Otherwise, when specifying (e.g.)

   ref_pressure=1.0e-5

(1 Pascal in bars), the value gets reinterpreted as

   ref_pressure=1

which is one bar.
 2013-05-14 10:19:12 +02:00
Bård Skaflestad 7db46d507f Merge pull request #239 from rolk/239_stlcheck 
Probe for library without using STL
 2013-05-13 02:44:52 -07:00
Bård Skaflestad 0ed065586a Merge pull request #234 from atgeirr/tof-improvements 
New and improved capabilities for time-of-flight and tracer partitioning computations.
 2013-04-24 23:24:37 -07:00
Bård Skaflestad d645965706 Merge pull request #231 from andlaus/fix_doxygen 
Fix a few doxygen issues with the tutorials
 2013-04-15 10:11:13 -07:00
Bård Skaflestad ef09f3d6f8 Merge pull request #219 from atgeirr/cleanup-interpolation 
Cleanup of linear interpolation utility
 2013-03-24 13:57:28 -07:00
Bård Skaflestad f3c79402d6 Merge pull request #217 from atgeirr/install-programs 
Add programs to be installed.
 2013-03-21 09:54:52 -07:00
Bård Skaflestad 36b3f46e93 Merge pull request #203 from atgeirr/combined 
Reorganisation and improvements in significant parts of opm-core
 2013-03-18 12:12:55 -07:00
Bård Skaflestad 520d97c63a Merge pull request #202 from rolk/202_mpi 
Allow MPI to be found and opm-core configured the same way as DUNE
 2013-03-15 06:52:17 -07:00
Bård Skaflestad fb9e09063c Merge pull request #193 from rolk/193_arch 
Don't search in architecture-irrelevant directories
 2013-03-13 03:41:29 -07:00
Bård Skaflestad ee748e6e64 Merge pull request #194 from rolk/194_bugfix 
Test strings on length before content
 2013-03-13 03:30:20 -07:00
Bård Skaflestad ae4b033ee7 Merge pull request #192 from rolk/192_findlibs 
Probe for indirect library dependencies
 2013-03-13 02:44:48 -07:00
Bård Skaflestad 144c5b9b59 Merge pull request #188 from rolk/188_maint 
Add maintainer information
 2013-03-08 08:48:23 -08:00
Bård Skaflestad c56228982a Merge pull request #189 from andlaus/do_not_list_copyright_header 
tutorial: make the copyright notice disappear in the HTML
 2013-03-08 08:47:41 -08:00