Commit Graph

4486 Commits

Author SHA1 Message Date
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
847f48aa78 Make initStateFromDeck with the new parser deck usable again.
My last merge broke compilation of opm-autodiff, as this new function
still relied on the old behaviour (the one taking a grid instead of
the data directly). This patch moved initStateFromDeck to the new behaviour.
2014-03-13 15:59:37 +01:00
Markus Blatt
a6fb099fbb Fixed SaturationPropsFromDeck::initEPSKey for new parser and non-UG
There the cell_centroids where still treated like double*. This patch
uses the UgGridHelpers instead.
2014-03-13 15:41:59 +01:00
Markus Blatt
eeb0039683 Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support
Manually resolved conflicts in:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/wells/WellsManager.cpp
2014-03-13 13:41:45 +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
Arne Morten Kvarving
50b2c9e56a add option to quell dune(-istl) warnings 2014-03-05 09:27:47 +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
Atgeirr Flø Rasmussen
37ddb928cf Merge pull request #505 from bska/prereqs-nit
Fix a few nits in "opm-core-prereqs.cmake"
2014-03-04 10:37:54 +01:00
Atgeirr Flø Rasmussen
73926a1b21 Merge pull request #495 from osae/endscale
Endpoint scaling and hysteresis for gwseg.
2014-03-04 10:29:50 +01:00
Bård Skaflestad
121c3911cb Elucidate description string for opm-parser.
The 'opm-parser' module is (currently) designed to parse ECL-type
simulation models.  Reflect that fact in its description.
2014-03-03 15:44:16 +01:00
Bård Skaflestad
c68667458e Defer searching for opm-parser
The "opm-parser" module is expected to become dependent upon the ERT
library.  Defer searching for the parser module until we've
established whether or not ERT is availble.

Suggested by: @andlaus
2014-03-03 15:05:53 +01:00
Bård Skaflestad
a18a6c4148 Merge pull request #504 from atgeirr/allow-no-spline-new-parser
Allow direct interpolation of props with new parser.
2014-03-03 11:00:26 +01:00
Atgeirr Flø Rasmussen
55d0055d84 Merge pull request #503 from bska/503_cmake
[CMake] Propagate Boost.Iostreams to all modules
2014-03-03 10:45:01 +01:00
Atgeirr Flø Rasmussen
0eb32276fb Allow direct interpolation of props with new parser.
After transitioning to use the new parser, the SinglePvtDead class was never
used even when the 'samples' argument used to control usage was zero or negative.
The resulting construction of SinglePvtDeadSpline objects was then failing.

This change adds a new constructor to SinglePvtDead, and restores the ability
to control spline usage with the samples argument.
2014-03-03 09:17:11 +01:00
Bård Skaflestad
d9db5da62e Restore C++-11 checks
While reformatting the parser-prereqs file I accidentally replaced
the feature search 'CXX11Features' with 'CXX10Features'.  This
commit fixes that blunder.
2014-02-28 22:07:27 +01:00
Bård Skaflestad
90ebf7b56d Fix mis-merge.
In propagating the requirements for opm-benchmarks to the other
modules I accidentally removed the 'opm-parser' prerequisite (see
commit 86439d6 for details).  This commit restores that prerequisite.
2014-02-28 20:00:44 +01:00
Bård Skaflestad
47d0956d64 Depend on Boost.Iostreams
The benchmark library uses Boost::iostreams to do decompression. Since
we only scan for the Boost dependency once, this submodule is added to
all of the projects in order to have a coherent dependency on Boost.
2014-02-28 19:13:46 +01:00
Bård Skaflestad
9fcd3d8181 Reformat prerequisite file according to convention
This commit makes a few adjustments to the white-space of file
'opm-parser-prereqs.cmake' to honour the conventions of the other
*-prereqs.cmake files within the OPM project's module suites.

No functional changes.
2014-02-28 19:06:42 +01:00
Bård Skaflestad
514240d0eb Uniformly raise Boost version requirement to 1.44
Commit 70505ff raised opm-core's "Boost" requirement to version 1.44
in order to reflect the requirements of the opm-parser module.  This
commit propagates that requirement to all other known modules.
2014-02-28 18:29:19 +01:00