Jørgen Kvalsvik
b0692304d5
Improve includes from opm-parser
...
Adopting to opm-parser PR#661, add previously missing includes.
https://github.com/OPM/opm-parser/pull/661
2016-01-26 13:30:58 +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
4a95eb2917
Merge pull request #939 from joakim-hove/table-column
...
Table column
2016-01-08 15:29:10 +01:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +01:00
chflo
c02966f6bc
OPM-163: Use EclipseState instead of Deck for PvtInterface
2016-01-07 16:36:28 +01:00
Atgeirr Flø Rasmussen
462b4ca996
Merge pull request #934 from totto82/residualSaturations
...
Add method to access the materialLawManager
2015-12-11 13:08:39 +01:00
Tor Harald Sandve
1deadd257f
Add method to access the materialLawManager
2015-12-11 12:50:54 +01:00
Liu Ming
4d4051ea2b
make the constructor as explicit.
2015-12-09 16:51:07 +08:00
Liu Ming
db103c7868
Merge remote branch 'remotes/opm/master' into relpermDiagnostics
...
Conflicts:
CMakeLists_files.cmake
2015-12-08 16:08:02 +08:00
Liu Ming
35dff82700
Use OpmLog to output messages.
...
return messages and opmLog.
2015-12-02 10:58:06 +08:00
Liu Ming
96b012d9b1
remove unused functions and comments, add documentations to diagnosis().
2015-11-30 10:52:34 +08:00
Liu Ming
a96f9b0d3b
1. remove eclState from phaseCheck_ function.
...
2. rename messager_ to messages_.
3. change 0 and 1 to 0.0 and 1.0
4. change unsigned to int.
2015-11-30 10:42:57 +08:00
Liu Ming
324b562d3d
reorder function and make more whitespace.
2015-11-30 10:26:59 +08:00
Liu Ming
45807a392d
make enum as private members.
2015-11-30 10:20:43 +08:00
Liu Ming
b4b23bfab0
1. Move implemtation to .cpp file.
...
2. Delete constructors.
3. Add config.h
2015-11-30 10:11:43 +08:00
Liu Ming
b30d04f5fa
Fix bugs and remove reptetitive messagers.
2015-11-27 10:47:04 +08:00
Liu Ming
f61ecdd777
Add NEXUS scaled endpoints consistency check.
2015-11-26 16:32:17 +08:00
Liu Ming
a19c0d49b7
Check scaled endpoints mobility.
2015-11-26 15:40:40 +08:00
Liu Ming
7fa569bc91
add endpoints scaling consistency check.
2015-11-26 15:22:51 +08:00
Liu Ming
693ac24483
make use of fluidSystem.
2015-11-20 11:04:50 +08:00
Liu Ming
255e0d4a24
unify the output messages.
2015-11-20 10:57:13 +08:00
Liu Ming
382df80573
clear up unused functions. Make some functions ad private member.
2015-11-19 16:24:09 +08:00
Liu Ming
5baa83bde4
fix typo and output message.
2015-11-19 13:51:03 +08:00
Liu Ming
ead2f3437a
clear message output.
2015-11-19 13:31:02 +08:00
Liu Ming
a4b6c7b9cc
solve git cherry-pick conflict.
2015-11-19 11:05:43 +08:00
Liu Ming
24152f9a65
Use messager container to store error message.
...
Conflicts:
opm/core/props/satfunc/RelpermDiagnostics.hpp
2015-11-19 11:00:21 +08:00
Liu Ming
d9a2fa6f42
initial RelpermDiagnostics.
2015-11-19 09:21:00 +08:00
Andreas Lauser
e3c066cd02
implement determining the threshold pressure from the initial condition
...
This needs to be done if a equilibration region transition is
mentioned by the THPRES keyword, but no value is given for this record
in the third item. (it seems that this is used quite frequently.)
Also, the approach taken by this patch also does not collide with the
restart machinery as far as I can see. This is because the initial
condition is applied by the simulator before the state at the restart
time is loaded. (I interpreted the code that way, but I could be
wrong, could anyone verify this?)
since it is pretty elaborate to calculate initial condition, this
patch is pretty messy. I also do not know if Eclipse does include
capillary pressure in this calculation or not (this patch does). Huge
kudos go to [at]totto82 for reviewing, testing and debugging this.
2015-11-05 12:29:19 +01:00
Markus Blatt
7d7f37f42d
Make constructor taking one argument explicit.
2015-10-28 13:19:42 +01:00
Markus Blatt
c871eaec5f
Added comment about 9 entries in permeability tensor.
2015-10-28 13:14:56 +01:00
Markus Blatt
c0e2d7748c
Allow the rock properties to be zero initialized without a deck.
...
This is needed in parallel runs where the rock properties will not
be read from the deck but be communicated from a master process. Nevertheless
we need to be able to initialize the data structures with the correct
container size. In addition we need to be able to change the container values
from opm-autodiff's BlackoilPropsDataHandle.
2015-10-26 23:52:24 +01:00
Atgeirr Flø Rasmussen
c65ad8292b
Make SaturationPropsFromDeck work for two-phase cases.
2015-10-21 15:27:52 +02:00
Andreas Lauser
d41f989a78
use the error macros from opm-common
2015-10-08 11:42:15 +02:00
Joakim Hove
2dc7d1cef7
Changed Table code to use TableContainer
2015-10-05 09:59:29 +02:00
Atgeirr Flø Rasmussen
827da9baa3
Moved compressedToCartesian() to its own file.
2015-09-15 14:13:58 +02:00
Atgeirr Flø Rasmussen
d0285c3eb1
Cleanup SaturationPropsFromDeck interface.
...
Unused methods and arguments have been removed,
and we avoid including the EclMaterialLawManager
in the header. Clients IncompPropertiesFromDeck
and BlackoilPropertiesFromDeck have been updated.
2015-09-14 15:02:59 +02:00
Atgeirr Flø Rasmussen
530df90a42
Remove unused args from constructor.
...
Also from init() function. This means the methods are no longer templates,
and have been moved to the cpp file.
2015-09-14 15:02:59 +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
Robert Kloefkorn
9ab8e6ec93
[BlackoilPropsFromDeck] remove sign/unsigned warnings.
2015-09-07 09:50:40 +02:00
babrodtk
2d252964ed
Fixed several warnings
2015-09-03 15:17:10 +02:00
Andreas Lauser
1ec3a6065a
SaturationPropsFromDeck: fix some array index screw-ups in the twophase case
...
I don't think the code gets more beatiful because of this, but it
seems like it does not crash anymore.
2015-09-02 12:29:18 +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
48d4abef1a
remove the now obsolete SatFunc* classes
2015-09-02 12:29:18 +02:00
Andreas Lauser
4a81a0acf1
SaturationPropsFromDeck: add the code to calculate all saturation properties using opm-material
...
also remove the now obsolete code in that class.
2015-09-02 12:29:11 +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
Atgeirr Flø Rasmussen
84acbc4601
Make saturation functions work with two phases again.
...
Note that this changes ExplicitArraysFluidState to take
a run-time argument for the number of phases.
2015-08-12 13:38:32 +02:00
Atgeirr Flø Rasmussen
23fd80d0b2
Bugfix: add forgotten setIndex() call.
2015-08-12 13:38:10 +02:00
Andreas Lauser
85cfd8da2a
use the multiplexer saturation function in SaturationPropsFromDeck
...
this makes it possible to switch to different saturation functions
again. So far the only supported function besides the default one is
the one which implements the "Stone 2" model.
2015-06-29 14:49:20 +02:00
Andreas Lauser
e3ab614c73
SaturationPropsFromDeck: make the jump to fluid states
...
this means the following changes:
- the "SatFuncGwseg" class is converted
- for now, Gwseg is the only saturation function supported by
SaturationPropsFromDeck. (will be changed in later commits.)
- the funcForCell() method of SaturationPropsFromDeck is removed as it
just occludes things
2015-06-29 14:49:20 +02:00
