Liu Ming
c5925c4dd9
mistake: count warning as error.
2016-04-02 11:53:36 +08:00
Liu Ming
c2bcc9cea8
do not write error summary twice.
2016-04-02 11:45:18 +08:00
Liu Ming
939085155e
refactor relperm diagnostics using OpmLog functions.
2016-04-01 12:27:03 +08:00
chflo
301653de83
Changed include due to OpmLog changed path
2016-03-17 15:59:50 +01:00
Liu Ming
395ff9a221
use two slashes for comments inside functions.
2016-03-11 17:19:39 +08:00
Liu Ming
26b4265427
use error variable.
2016-03-11 17:15:32 +08:00
Liu Ming
40c98b91e7
fix saturation family bug.
2016-03-11 17:13:40 +08:00
Liu Ming
7cecb10edf
fix indentation and fluid system issues.
2016-03-11 17:03:31 +08:00
Liu Ming
8cea813d57
Merge remote branch 'remotes/opm/master' into solvent-diagnostics
2016-03-10 14:38:22 +08:00
Liu Ming
df67ef2e75
Add solvent saturation functions support.
2016-03-10 14:32:43 +08:00
Liu Ming
04946d7526
Add solvent to fluid system.
2016-03-10 11:17:18 +08:00
Andreas Lauser
ccc1ca0b76
BlackoilPropertiesFromDeck: properly calculate the Rs and Rv values for viscosity
...
the dissolution factors used for the viscosities were always zero so
far. this was not discovered earlier because flow is completely
unaffected by this since the only place where this class is used in
flow is the equilibration code and the equilibration code does not
need phase viscosities.
thanks to @atgeirr for finding this.
2016-03-08 11:07:20 +01:00
Andreas Lauser
a9f758a8e7
replace the blackoil PVT classes by the ones of opm-material
...
the opm-material classes are the ones which are now used by
opm-autodiff and this patch makes it much easier to keep the opm-core
and opm-autodiff results consistent. Also, the opm-material classes
seem to be a bit faster than the opm-core ones (see
https://github.com/OPM/opm-autodiff/pull/576 )
I ran the usual array of tests with `flow`: SPE1, SPE3, SPE9 and Norne
all produce the same results at the identical runtime (modulo noise)
and also "Model 2" seems to work.
2016-03-05 19:11:44 +01:00
Atgeirr Flø Rasmussen
d6c0e771ca
Only .cpp files should include config.h.
2016-03-04 09:10:19 +01:00
Atgeirr Flø Rasmussen
6b2f1d1507
Include template implementation file.
2016-03-04 09:09:52 +01:00
Liu Ming
355f349470
make grid as template parameter.
2016-03-04 09:09:38 +08:00
Andreas Lauser
68be58faa9
fix some recent deprecation warnings
...
these are caused by OPM/opm-parser#687 . While they are harmless, they
are certainly annoying. (that's their point!)
2016-02-21 17:29:43 +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
Jørgen Kvalsvik
9836712782
Remove unused Wrapper includes from Deck/Utility
2016-02-17 14:46:15 +01:00
Bård Skaflestad
83f474f118
Merge pull request #946 from jokva/clean-up-header
...
Improve includes from opm-parser
2016-01-26 15:58:25 +01:00
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
Liu Ming
cd55b1f4b5
Omit some usages of to_string function.
2016-01-25 11:18:56 +08:00
Liu Ming
e227b6bb96
change headline to saturation functions diagnostics.
2016-01-25 11:00:23 +08:00
Liu Ming
6aca45b576
Format output and add SATNUM for scaled saturation endpoints.
2016-01-25 10:58:50 +08:00
Liu Ming
aae9169cff
fix bugs: counter warning as error.
2016-01-25 09:38:55 +08:00
Liu Ming
675f730b01
Merge remote branch 'remotes/opm/master' into update_relperm_diagnostics
...
Conflicts:
opm/core/props/satfunc/RelpermDiagnostics.cpp
2016-01-22 13:04:01 +08: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
Liu Ming
6efd22c637
fix typo.
2016-01-21 16:10:31 +08:00
Liu Ming
8b4dda67ed
remove comments.
2016-01-21 14:04:01 +08:00
Liu Ming
ee71a59ece
make const as more as possible
2016-01-21 14:01:02 +08:00
Liu Ming
a7238d0a7d
saturation region should start with 1.
2016-01-21 13:47:57 +08:00
Liu Ming
4daa70292e
fix formatting and grammar issues.
2016-01-21 13:45:32 +08:00
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
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