Joakim Hove
a2fd7307b8
Using the well_controls_get_xxx() functions.
2014-01-09 12:06:26 +01:00
Atgeirr Flø Rasmussen
0ff823f88c
Merge pull request #45 from xavierr/master
...
Fixed build
2013-12-16 03:07:32 -08:00
Xavier Raynaud
2a20e6ebd1
Fixed build.
2013-12-16 11:43:52 +01:00
Xavier Raynaud
5725438b17
Merge remote-tracking branch 'source/master'
2013-12-16 11:39:12 +01:00
Atgeirr Flø Rasmussen
d3453c4ded
Merge pull request #44 from qilicun/fix_eff_relperm
...
fix derivative of effective relperm respect to concentration.
2013-12-16 01:55:59 -08:00
Liu Ming
720e7ebbef
fix derivative of effective relperm respect to concentration.
2013-12-12 17:44:00 +08:00
Xavier Raynaud
542762abb6
Merge remote-tracking branch 'source/master'
2013-12-12 09:51:29 +01:00
Bård Skaflestad
525f055475
Merge pull request #37 from atgeirr/bump-version
...
Bump version number and label.
2013-10-21 06:16:49 -07:00
Bård Skaflestad
741a9653ed
Merge pull request #32 from andlaus/fix_headers
...
make headers autonomously includable and fix a few harmless clang warnings
2013-09-24 02:39:07 -07:00
Andreas Lauser
44e0848127
make headers autonomously includable and fix a few harmless clang warnings
2013-09-10 19:41:49 +02:00
Bård Skaflestad
9bed84b63f
Merge pull request #31 from andlaus/adapt_exception_code
...
Adapt exception code
2013-09-09 03:46:53 -07:00
Andreas Lauser
4859e77c79
explicitly include <iostream> in files which use std::cout or std::cerr
2013-09-05 12:39:11 +02:00
Andreas Lauser
05af2ab6ff
Replace MESSAGE by OPM_MESSAGE
2013-09-03 15:43:58 +02:00
Andreas Lauser
7e8d941a6f
Replace THROW by OPM_THROW
2013-09-03 15:43:58 +02:00
Andreas Lauser
6a6d0c9b28
Replace the ASSERT and ASSERT2 macros by assert
2013-09-03 15:43:51 +02:00
Andreas Lauser
8ce809c400
Add exception handlers to all unit tests, tutorials and examples
2013-09-03 15:43:51 +02:00
Roland Kaufmann
85f60ad092
Merge pull request #30 from rolk/030_cmake
...
CMake rollup in anticipation of the 2013.09 release
2013-08-28 11:53:26 -07:00
Roland Kaufmann
fb0aab35d4
Compatibility module for dunecontrol-driven clients
...
If a client generated with duneproject/built with dunecontrol has a
dependency to opm-polymer, the macros defined in this file is expected
to exist and will be called to search for the opm-polymer library.
All that is done here is to use the pkg-config helper module and
import the configuration that was written by the CMake system (which
even may have been called earlier in the same dunecontrol "session")
2013-08-10 23:22:24 +02:00
Roland Kaufmann
a6aab48b2c
Library to pick up configuration from pkg-config files
...
Pkg-config files are written as part of the CMake configuration, and
these can be imported into AutoTools-driven projects to get the correct
compiler and linker options that has been probed.
2013-08-10 23:20:07 +02:00
Roland Kaufmann
d85f70cf4d
Remove AutoTools files that searches for libraries
...
These are now superceded by CMake equivalents, and will over time
diverge from the main tree as they are no longer maintained.
2013-08-10 23:19:59 +02:00
Atgeirr Flø Rasmussen
d2318d3a34
Merge pull request #28 from atgeirr/issue-027-fix
...
Fix bug in call to viscosity().
2013-06-24 06:03:07 -07:00
Atgeirr Flø Rasmussen
d065a908d3
Fix issue 27, bug in call to viscosity().
2013-06-10 10:31:18 +02:00
Atgeirr Flø Rasmussen
ccd5c8487d
Merge pull request #24 from rolk/024_cmake
...
CMake rollup
2013-04-09 06:37:34 -07:00
Atgeirr Flø Rasmussen
0bd761dd86
Merge pull request #23 from rolk/023_cmake
...
CMake rollup
2013-04-03 03:19:21 -07:00
Atgeirr Flø Rasmussen
92086864b2
Merge pull request #22 from akva2/debian_app_packaging
...
added: debian packaging for applications
2013-03-25 00:21:51 -07:00
Atgeirr Flø Rasmussen
ec5eec23b1
Merge pull request #19 from akva2/redhat_packaging
...
added: redhat packaging spec file
2013-03-22 03:51:26 -07:00
Atgeirr Flø Rasmussen
e07543afc5
Merge pull request #21 from atgeirr/install-programs
...
Add simulator programs to be installed.
2013-03-22 03:15:22 -07:00
Atgeirr Flø Rasmussen
acdb476311
Merge pull request #18 from akva2/debian_packaging
...
added: debian packaging control files
2013-03-20 03:31:46 -07:00
Bård Skaflestad
8200b5dff7
Merge pull request #17 from atgeirr/combined
...
Adapt to changes in OPM/opm-core#203
2013-03-18 12:14:46 -07:00
Atgeirr Flø Rasmussen
7d5d314fc0
Update to match opm-core changes.
2013-03-18 13:10:32 +01:00
Atgeirr Flø Rasmussen
3d5bd7ef96
Merge remote-tracking branch 'upstream/release/2013.03' into combined
2013-03-18 08:37:54 +01:00
Atgeirr Flø Rasmussen
1f64098baf
Merge pull request #14 from rolk/014_cmakeupd
...
Update CMake scripts to commit 9c1da9f5 from opm-core
2013-03-17 13:17:27 -07:00
Atgeirr Flø Rasmussen
c16cb6987b
Renames classes in line with opm-core changes.
2013-03-15 18:33:41 +01:00
Atgeirr Flø Rasmussen
04abba4d5e
Adapt to changed opm-core header name.
2013-03-15 17:55:24 +01:00
Atgeirr Flø Rasmussen
864cce5f5e
Adapt to moved opm-core headers.
2013-03-14 13:59:31 +01:00
Atgeirr Flø Rasmussen
e6de9b5352
Merge pull request #13 from atgeirr/make-io-subdir
...
Adapt to changed include paths for some opm-core headers.
2013-03-13 05:46:17 -07:00
Atgeirr Flø Rasmussen
23cef788fc
Adapt to changed include paths for some opm-core headers.
2013-03-12 11:08:33 +01:00
Atgeirr Flø Rasmussen
6c00d98a9e
Merge pull request #12 from rolk/012_cmakeupd
...
Update CMake scripts to commit f6d44238 from opm-core
2013-03-12 03:01:24 -07:00
Atgeirr Flø Rasmussen
97857b6b2b
Merge pull request #11 from rolk/011_cmakeupd
...
Update CMake scripts to commit e75d69ef from opm-core
2013-03-06 02:22:32 -08:00
Roland Kaufmann
7e3a81f1a6
Remove make execution wrapper
2013-03-06 11:01:17 +01:00
Roland Kaufmann
f5e19e9b87
Remove remnants of the Autotools build system
2013-02-22 23:34:21 +01:00
Roland Kaufmann
4e34a967cb
Ignore output from CMake build
2013-02-22 23:34:21 +01:00
Roland Kaufmann
7925901380
Import cmake/ from commit 5f82198c in opm-core
2013-02-22 23:31:13 +01:00
Atgeirr Flø Rasmussen
661357d403
Merge pull request #6 from atgeirr/master
...
Improved output facilities
2013-01-17 05:50:36 -08:00
Atgeirr Flø Rasmussen
b4d5e03c61
Add eclipse output to simulator.
...
Note: so far only for incompressible fluid simulator.
2012-11-26 11:01:23 +01:00
Atgeirr Flø Rasmussen
b6b59918e1
Suppress output of multi-cell-block sizes and #iterations.
2012-11-26 11:00:20 +01:00
Atgeirr Flø Rasmussen
2f521169c5
Add ert-detecting macro for building with ert support.
...
This is primarily intended for enabling eclipse-format output from simulators.
Also add missing header to Makefile.am, to fix 'make distcheck'.
2012-11-26 10:58:18 +01:00
Atgeirr Flø Rasmussen
bcfcfdc930
Use minimum 5 digits for step numbers in output file names.
...
Was 3 digits, created trouble for certain scripts reading
the files when more than 1000 steps were taken.
2012-11-05 15:37:14 +01:00
Atgeirr Flø Rasmussen
be617bbe7b
Merge pull request #5 from atgeirr/master
...
Add well management to polymer simulators.
2012-10-15 05:28:25 -07:00
Atgeirr Flø Rasmussen
2b292108ad
Added well management to SimulatorCompressiblePolymer.
...
Another polymer-specific overload of computeFractionalFlow()
has been added in support of this (this overload deals with
compressible properties.
Also added pressure normalization for situations with arbitrary
absolute pressure.
2012-10-15 14:23:13 +02:00
