Commit Graph
4227 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen b21d61c151 Merge pull request #532 from blattms/add-linsolver-test
Added a test for the linear solver interface.
2014-03-20 08:46:17 +01:00
Markus Blatt 7281a9567f Added a test for the linear solver interface.
This test sets up a simple laplace problem and solves it with the available
solvers. It assume that either dune-istl or UMFPack is present, which is
assume to be safe.
2014-03-19 21:48:07 +01:00
Atgeirr Flø Rasmussen b461e35ae5 Merge pull request #531 from blattms/support-fast-amg-2.3-part2
Complete cf7f07b PR #530 to support FastAMG with dune-istl 2.3
2014-03-19 20:47:48 +01:00
Markus Blatt b773c3de89 Include fastamg.hh for dune-istl 2.3
For the inofficial 2.2 release this was included automatically with amg.hh.
2014-03-19 19:51:17 +01:00
Markus Blatt 69a6a38856 Complete cf7f07b PR #530 to support FastAMG with dune-istl 2.3
This fixes further occurences of DUNE_HAS_FASTAMG that were
missed in pull request #530.

Previously we relied on the define DUNE_HAS_FAST_AMG to detect
whether these preconditioners are available. This define is only
available in the 2.2 release with cmake support. Therfore we now
addtionally test whether we are using dune-istl 2.3 or newer.
2014-03-19 17:40:02 +01:00
Atgeirr Flø Rasmussen f2d3098e50 Merge pull request #530 from blattms/support-fast-amg-2.3
Makes KAMG and FastAMG solver available with dune-istl 2.3
2014-03-19 15:28:23 +01:00
Markus Blatt 1ad8381b04 [cmake] do not export dune-istl version but use module local detection.
According to @rolk defines should only be exported in
cmake/Modules/<module>-prereqs.cmake if they are used in the
headers. This is not the case for the dune-istl version macros and
therefore we use opm_need_version_of in the config_hook in the top
level CMakefile with this patch.
2014-03-19 15:15:55 +01:00
Atgeirr Flø Rasmussen 3d9ef44625 Merge pull request #528 from blattms/fix-nonunifom
Fixes compilation of BlackoilPropertiesFromDeck.cpp.
2014-03-19 12:31:05 +01:00
Atgeirr Flø Rasmussen f4c899db4b Merge pull request #525 from andlaus/SimulatorTimer_allow_to_be_limited_to_subranges
SimulatorTimer: allow it to be limited to a sub-range of all report steps
2014-03-19 12:21:37 +01:00
Atgeirr Flø Rasmussen 830459d9d0 Merge pull request #529 from andlaus/change_default_threephase_model
endpoint scaling: change default threephase_model to gwseg
2014-03-19 12:19:28 +01:00
Andreas Lauser 95985f0694 SimulatorTimer: allow it to be limited to a sub-range of all report steps 2014-03-19 11:36:39 +01:00
Andreas Lauser 829f791261 endpoint scaling: change default threephase_model to gwseg
and throw an exception if "simple" is encountered...

According to Ove, gwseg should be used, because "gwseg is the model
relevant to the norne case - i.e the model eclipse uses.

The fix for the simple model has to wait for a refac of the satfunc
complex."
2014-03-19 11:22:43 +01:00
Markus Blatt cf7f07b179 Makes KAMG and FastAMG solver available with dune-istl 2.3
Previously we relied on the define DUNE_HAS_FAST_AMG to detect
whether these preconditioners are available. This define is only
available in the 2.2 release with cmake support. Therfore we now
addtionally test whether we are using dune-isl 2.3 or newer.
2014-03-19 11:19:25 +01:00
Markus Blatt fed0136a21 Fixes compilation of BlackoilPropertiesFromDeck.cpp.
Patch 31c09aed was erroneous as it was trying to assing a
SaturationPropsFromDeck<SatFuncSimpleNonuniform> to a
SaturationPropsFromDeck<SatFuncSimpleUniform> in the constructor
taking the new parser. This patch fixes this.
2014-03-19 11:09:13 +01:00
Atgeirr Flø Rasmussen a529dd5ae4 Merge pull request #517 from blattms/issue-516
Apply changes from commit a953ba8 to new parser code too.
2014-03-19 08:29:16 +01:00
Atgeirr Flø Rasmussen 847e0b3bcb Merge pull request #527 from andlaus/fix_blackoil_pvt_props_in_new_parser
fix densities for new parser in BlackoilPvtProperties
2014-03-18 23:27:31 +01:00
Andreas Lauser 5c55fb7341 fix densities for new parser in BlackoilPvtProperties
that is one of the more subtle differences between the old and the
new parsers. now, valgrind does not seem to complain anymore, so everything
should be All Right (TM) ;)
2014-03-18 20:42:40 +01:00
Atgeirr Flø Rasmussen 24e4d087d8 Merge pull request #526 from andlaus/endpoint_scaling_correct_revers_condition
endpoint scaling: invert condition
2014-03-18 15:51:16 +01:00
Andreas Lauser 83dcf17d5b endpoint scaling: invert condition
yeah, true and false are difficult things sometimes...
2014-03-18 15:11:38 +01:00
Atgeirr Flø Rasmussen 1ef11653b4 Merge pull request #515 from andlaus/EclipseWriter_cleanups
Eclipse writer cleanups
2014-03-17 15:24:07 +01:00
Bård Skaflestad ebe2a80439 Merge pull request #522 from atgeirr/explicit-constructors
Made single-argument constructors explicit.
2014-03-17 07:44:25 -05:00
Atgeirr Flø Rasmussen f8f7550782 Made single-argument constructors explicit.
Avoids unintended implicit conversions.
2014-03-17 13:27:50 +01:00
Bård Skaflestad e65d99ad4c Merge pull request #508 from atgeirr/adjust-initial-wellrates
Adjustment to well rate initialisation.
2014-03-15 14:59:27 +01:00
Andreas Lauser 314b3a32d8 some cleanups for EclipseWriter
- the output=true|false parameter gets respected now
- if output is "true", it is checked that the value of the
  "output_dir" parameter is a directory (although I did not find an
  easy way to check whether it is writable short of writing a file to
  it.)
- the "output_interval" parameter gets respected as well
- the index of a written timestep is now independent of the time step
  index of the simulation: the initial solution is always 0, the first
  result written to disk is always 1 and so on... (i.e., it does not
  matter anymore how many steps the simulator needed between two writes)

these changes have been proposed by @atgeirr. Thanks!
2014-03-14 19:45:15 +01:00
Atgeirr Flø Rasmussen 065efc5b0e Merge pull request #520 from qilicun/plyshear
Read keyword PLYSHEAR.
2014-03-14 12:36:21 +01:00
Atgeirr Flø Rasmussen d2e6ccec33 Fix logic related to open/shut wells initialisation. 2014-03-14 11:27:20 +01:00
Atgeirr Flø Rasmussen d25b9cd13a Merge pull request #514 from joakim-hove/wells-cpos-manipulation
Removed cpos = ~cpos constructions for closing a well
2014-03-14 11:08:53 +01:00
Liu Ming 5fff1d25dc Read keyword PLYSHEAR. 2014-03-14 15:34:38 +08:00
Atgeirr Flø Rasmussen c59727720d Merge pull request #511 from andlaus/initStateFromDeck_reverse_PRESSURE_and_EQUIL
initStateFromDeck: reverse the priorities of the PRESSURE and EQUIL keywords
2014-03-13 20:30:31 +01:00
Andreas Lauser de792c72c7 initStateFromDeck(): do not accept potentially contradicting ways to set the initial condition
i.e. PRESSURE and EQUIL are now considered mutually exclusive...
2014-03-13 16:33:32 +01:00
Markus Blatt 21bf14de0d Fixed missed on occurence of number of samples 2014-03-13 12:13:11 +01:00
Markus Blatt 31c09aed09 Apply changes from commit a953ba8 to new parser code too.
The mentioned commit was applied before the merge of
opm-parser-integrate and therefore the changes did not carry over
to the code that uses the new parser. This code mimics the
changed behaviour for the new parser.

Closes issue #516
2014-03-13 12:00:01 +01:00
Joakim Hove 58f96a5808 Will check if a well is open before throwing for an invalid control. 2014-03-12 20:27:17 +01:00
Andreas Lauser 3aef6578f9 SimulatorTimer: rename currentTime() to simulationTimeElapsed()
because the name "currentTime()" can be mistaken for the point in
real-life time at which the simulation is run (e.g. March 11, 2014,
15:07:45.123), the _point_ in time which the simulator timer currently
represents (e.g. Jun 5, 1985, 02:33:12.345) instead of the simulator
time in seconds which elapsed since the START date
(e.g. 52633.345 s).

this rename may lead to some fallout in other modules. I'll
fix them after this PR has been merged...
2014-03-12 19:01:58 +01:00
Joakim Hove 1f94abcf14 Removed cpos = ~cpos constructions for closing a well; using well_controls_shut_well explicitly instead. 2014-03-12 17:41:40 +01:00
Atgeirr Flø Rasmussen ddf256a451 Merge pull request #512 from karbor/master
Added support of SWCR and SOWCR in CornerpointChopper
2014-03-11 20:54:02 +01:00
Bård Skaflestad baf4294e8b Merge pull request #513 from flikka/use-dyn-boost-check-once
Only look for BOOST´s unit test framework module if not already found. Sync version requirement.

This resolves #509.
2014-03-11 19:16:04 +01:00
Kristian Flikka 53656841b5 Only look for BOOST´s unit test framework module if not already found. Sync version with rest of system 2014-03-11 18:24:11 +01:00
Kari B. Skjerve c34d7a40fc Added support of SWCR and SOWCR in CornerpointChopper 2014-03-11 14:51:23 +01:00
Atgeirr Flø Rasmussen f1377d9729 Bugfix: || -> && 2014-03-11 12:54:04 +01:00
Atgeirr Flø Rasmussen c46ad990c1 Assert to avoid future surprises.
Well types must be either INJECTOR or PRODUCER for now, if
we change this in the future, we should check this part of
the code as well.
2014-03-11 12:51:49 +01:00
Atgeirr Flø Rasmussen dbd0635fda Commented choices in initialisation of well rates. 2014-03-11 12:50:58 +01:00
Atgeirr Flø Rasmussen e510dde102 Initialize well rates better.
Instead of making well rates zero for wells that are not controlled by
surface volume, we initialize them to a small value with the correct
sign (positive for injectors, negative for producers).
2014-03-10 13:30:43 +01:00
Bård Skaflestad e2d5aafb56 Merge pull request #506 from atgeirr/suppress-warnings
Suppress warnings
2014-03-06 11:37:17 +01:00
Atgeirr Flø Rasmussen 9edbe36b58 Remove extra semicolon. 2014-03-06 08:24:00 +01:00
Atgeirr Flø Rasmussen ec22c9b491 Remove warning pragmas.
They are only available on gcc 4.6 and newer, and clang.
2014-03-05 08:41:53 +01:00
Bård Skaflestad 3a8eeff1f6 Merge pull request #507 from joakim-hove/well-controls-open-close
Changed open / close behaviour of well_controls
2014-03-04 21:56:58 +01:00
Joakim Hove ae4738f5e7 Changed open / close behaviour of well_controls: 1) well_controls has an explicit open_close flag. 2) Will NOT flip current value to change open|close status 2014-03-04 20:23:19 +01:00
Atgeirr Flø Rasmussen f35c193b38 Suppress unused argument warnings. 2014-03-04 11:32:32 +01:00
Atgeirr Flø Rasmussen 97328b5a17 Suppress warnings from included istl code.
This is done using #pragma GCC and works also in clang.
2014-03-04 11:31:16 +01:00