Liu Ming
a7aa2cf2c3
Add region number for output and output summary msg to streamLog
2016-01-18 11:10:51 +08:00
Liu Ming
598f456a29
change error to warning due to eclipse manual.
2016-01-18 11:10:36 +08:00
Liu Ming
30ace9cdcc
Add region number for unscaled endpoints.
2016-01-18 11:10:26 +08:00
Liu Ming
708da37250
1. use scaled_messages_ to store scaled endpoints infor.
...
2. format the terminal output messages.
2016-01-18 11:10:14 +08:00
Liu Ming
6753c84547
Add counter for numbering warning, error, proble, and bugs.
2016-01-18 11:10:04 +08:00
Liu Ming
2f19d0bba6
For that break clipse rules should raise an error.
2016-01-18 11:09:50 +08:00
Liu Ming
5c271db842
add cell index for scaled endpoints error messages output.
2016-01-18 11:09:02 +08:00
Joakim Hove
718ec8e791
Changed to use new table api from opm-parser.
2016-01-08 14:47:09 +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
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
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
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
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
Andreas Lauser
2d5798f51a
SaturationPropsFromDeck: remove the 'SatFuncSet' template parameter
...
in any reasonable simulator which reads an ECL deck the deck is going
to decide which saturation function is to be used and not the outside
code. also, the table this which function will be using is not really the
calling code's business. (for any reasonable deck it is always going to
be a non-uniform table so it makes a lot of sense to avoid unnecessary
complexity IMO.)
this patch temporarily removes the ability to use anything except the
ECL default saturation function ("Gwseg"). this ability will be
restored later in this patch series.
2015-06-29 14:49:20 +02:00
Andreas Lauser
55786028fd
remove obsolete and empty file SaturationPropsFromDeck.cpp
2015-06-26 13:01:22 +02:00
osae
c7f4ea8abd
Rename eclState to eclipseState.
2014-11-05 16:10:05 +01:00
osae
2c09d2ce57
Base initialisation of SWL etc on EclipseState ...
...
Thus allowing an unmodified Norne deck.
2014-11-05 16:10:05 +01:00
osae
93dde017c6
Bugfix: Actually use column index ...
2014-11-05 16:10:05 +01:00
osae
1b5708871d
Cleaning up and preparation for eclipseState.
2014-11-05 16:10:05 +01:00
Andreas Lauser
36e3538b04
adapt the the table related API changes of opm-parser
2014-09-19 14:40:35 +02:00
Atgeirr Flø Rasmussen
166cd0fe6b
Suppress unused argument warning.
...
The eclState argument was added in PR#634, and may be needed later.
Until then, this silences the warning generated.
2014-08-28 14:14:22 +02:00