Markus Blatt
9f99484347
Prevent dereferencing the end iterator.
...
This happened for empty regions and surfaced when compiling
with "-D_GLIBCXX_DEBUG -DDEBUG -DGLIBCXX_FORCE_NEW".
2016-05-06 21:40:33 +02:00
babrodtk
cae4d39a86
Code cleanup
2016-04-26 07:48:58 +02:00
babrodtk
dcf9c6a067
Checkpoint
2016-04-26 07:48:58 +02:00
Andreas Lauser
90ff56503d
adapt code w.r.t. the removal of the tags for Opm::Evaluation
2016-04-15 18:48:47 +02:00
Pål Grønås Drange
f1a31ca5e4
Using API get3DProperties()
2016-04-11 15:13:38 +02:00
Pål Grønås Drange
8ce248bc63
Updated opm-core to use new EclipseState API in opm-parser
2016-04-08 16:30:01 +02:00
Atgeirr Flø Rasmussen
734fbfc38d
Implement direct fast field access.
2016-03-29 10:46:14 +02:00
Joakim Hove
a256dc0e5d
Replaced SimulatorState -> SimulationDatacontainer
...
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
Jørgen Kvalsvik
dd77a39d95
Remove Equil + EquilWrapper, replace with upstream
...
Upstream (opm-parser) now provides a better Equil + EquilRecord, and
simultaneously deprecated EquilWrapper. This patch fixes the resulting
breakage.
One important note: The new Equil does not expose integers for live
oil/wet gas initialization procedure methods, but rather booleans
through constRs/constRv methods. This is how the variable behaves
according to the Eclipse reference manual (EQUIL keyword section).
Code has been updated to reflect this.
2016-03-01 09:59:54 +01:00
Jørgen Kvalsvik
33f8446a4e
Add missing opm-parser headers
...
opm-parser pull #695
https://github.com/OPM/opm-parser/pull/695
2016-02-26 11:49:40 +01:00
Joakim Hove
4bab7b7f4c
Added free function initSaturation().
...
The state argument is of type SimulatorState& - and no longer a template
parameter.
2016-02-22 22:03:41 +01:00
Joakim Hove
84485dde53
Changes in SimulatorState:
...
1. Added method setCellDataComponent()
2. Removed setFirstSat()
Implemented saturation initialisation using setCellDataComponent()
instead of setFirstSat(). This way the template<class Props> has been
removed from the SimulatorState class.
2016-02-22 08:42:04 +01:00
Atgeirr Flø Rasmussen
b9d44c1f4b
Merge pull request #957 from joakim-hove/cmp-template
...
Using template for cmp::vector_equal()
2016-02-19 11:41:07 +01:00
Joakim Hove
c40ed3ece6
Using template for cmp::vector_equal()
2016-02-19 07:57:02 +01:00
Jørgen Kvalsvik
04d605159f
Change Deck access methods/types to references
...
opm-parser#677 changes the return types for the Deck family of classes.
This patch fixes all broken code from that patch set.
https://github.com/OPM/opm-parser/pull/677
2016-02-18 08:50:26 +01:00
Joakim Hove
83a32061f7
Removed opm_memcmp_double() - use cmp from common.
2016-02-14 21:41:51 +01:00
Jørgen Kvalsvik
50c1bbdc85
Fixes includes wrt opm-parser PR-656
...
Several files stopped compiling due to relying on opm-parser headers
doing includes. From opm-parser PR-656
https://github.com/OPM/opm-parser/pull/656 this assumption is no longer
valid.
2016-01-21 09:42:51 +01:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
Tor Harald Sandve
f24dcf1957
Use cell depths based on averaging cell corners
2015-11-24 10:17:12 +01:00
Atgeirr Flø Rasmussen
c0cd038e97
Merge pull request #920 from totto82/interpolation_points
...
Change the number of integration points in the initialization
2015-11-09 16:52:30 +01:00
Tor Harald Sandve
3086e67ee2
Change the number of integration points in the initialization
...
The number is changed from 100->2000 to increase accuracy.
2015-10-30 08:14:10 +01:00
Arne Morten Kvarving
5674635125
fix Equilibration test by adding some fuzz
...
Backports parts of a7b1e69a45c14ec88a82b92ee704424f1ea1b41c
2015-10-26 11:21:26 +01:00
Andreas Lauser
d41f989a78
use the error macros from opm-common
2015-10-08 11:42:15 +02:00
Joakim Hove
d54899ba07
Fxied bug in table-container use.
2015-10-05 15:59:08 +02:00
Joakim Hove
adb333177d
Merge pull request #886 from joakim-hove/table-container
...
Changed Table code to use TableContainer
2015-10-05 14:46:49 +02:00
Joakim Hove
2dc7d1cef7
Changed Table code to use TableContainer
2015-10-05 09:59:29 +02:00
osae
04107a1955
Support for equil-initialisation for datum depth outside oil zone.
2015-09-21 18:22:11 +02:00
Robert Kloefkorn
8163137b2c
WellState: move typedefs into public section and include string.
2015-09-16 12:36:05 +02:00
Robert Kloefkorn
50bf1d7e62
WellState: add assertion on wells->name[].
2015-09-16 09:48:43 +02:00
Robert Kloefkorn
14d7ce43a6
WellState: move mapping from well name to well index to here from autodiff's WellStateFullyImplicitBlackoil.
2015-09-16 09:48:43 +02:00
Bård Skaflestad
99368d73d2
RegionMapping<>: Support arbitrary region IDs
...
This commit introduces a new public method, activeRegions(), that
retrieves those region IDs that contain at least one active cell.
We furthermore extend the cells() method to support lookup of
arbitrary region IDs. Non-active region IDs produce empty cell
ranges.
Intended use case is
for (const auto& reg : rmap.activeRegions()) {
const auto& c = rmap.cells(reg);
// use c
}
2015-09-15 15:33:22 +02:00
Bård Skaflestad
b5ba068309
convertSats(): Transpose loop nest for locality of data
2015-09-15 15:33:22 +02:00
Bård Skaflestad
7090b58f03
Mark non-template functions in headers as 'inline'
2015-09-15 15:33:22 +02:00
Robert Kloefkorn
67200b54e6
SimulatorState: export num_cells_ and num_faces_ and allow to register data from any
...
class. This is needed in the parallel output class. A formal interface for the state
class needs to be introduced.
2015-09-14 12:57:36 +02:00
babrodtk
2d252964ed
Fixed several warnings
2015-09-03 15:17:10 +02:00
Andreas Lauser
750e9aedf4
use a .cpp instead of an _impl.hpp file for SaturationPropsFromDeck
...
this avoids having to include the "Evaluation.hpp" file as the first
thing in the morning.
2015-09-02 12:29:18 +02:00
Andreas Lauser
823f3a4032
InitStateEquil: fix valgrind complaint about uninitialized values
...
it seems that it was pure luck that this worked so far!
2015-09-02 12:29:18 +02:00
Andreas Lauser
97f62d5f6f
add a fluid state where scalars include the derivatives w.r.t. the saturations
2015-09-02 12:23:24 +02:00
Andreas Lauser
d57d121c38
ExplicitArraysFluidState: always make it appear threephase to the exterior, but also accept twophase arrays
2015-09-02 12:23:24 +02:00
Joakim Hove
08a77e36d0
Using TableManager to get tables.
2015-09-01 12:58:09 +02:00
babrodtk
6365579866
Fixed whitespace
2015-08-19 13:20:58 +02:00
Atgeirr Flø Rasmussen
68428ad856
Do thp init() differently.
2015-08-19 13:12:15 +02:00
babrodtk
60a66165f5
Minor fixes
2015-08-19 13:12:14 +02:00
babrodtk
9458fcc498
Fixed several compiler warnings
2015-08-19 13:12:14 +02:00
babrodtk
9d602f0cd0
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:12:14 +02:00
babrodtk
25155aefbb
More integration of VFP tables
2015-08-19 13:12:03 +02:00
babrodtk
92628187b0
Initial integration of VFP
2015-08-19 13:11:41 +02:00
babrodtk
c6311decdc
Fixed warning
2015-08-19 13:10:48 +02:00
babrodtk
ffac75a873
Update support for VFP tables: Now produces almost identical results to BHP for 'identity' table'
2015-08-19 13:10:48 +02:00
babrodtk
83f6b02941
More integration of VFP tables
2015-08-19 13:10:48 +02:00