Atgeirr Flø Rasmussen
95d4a8101d
Merge pull request #1125 from jokva/reduce-deck-use-relperm-diagnostics
...
Don't rely on Deck for checkTable and checkPhase
2017-01-09 09:35:25 +01:00
Atgeirr Flø Rasmussen
d81c150bae
Remove unused Deck function argument.
2017-01-02 09:47:57 +01:00
Jørgen Kvalsvik
bbb30de74e
Don't rely on Deck for checkTable and checkPhase
...
Prefer using EclipseState over Deck.
2016-12-20 14:08:58 +01:00
Andreas Lauser
c910ec11da
Merge pull request #1096 from andlaus/Evaluation_accessors
...
use accessor methods to access the value and derivatives of Evaluation objects
2016-11-01 13:16:05 +01:00
Andreas Lauser
ced224378f
use accessor methods to access the value and derivatives of Evaluation objects
2016-10-27 16:53:52 +02:00
Atgeirr Flø Rasmussen
5662c32605
Fix saturation family diagnostics for two-phase case.
2016-10-27 11:58:50 +02:00
Andreas Lauser
ce4d7c586e
RelpermDiagnostics: fix the build
...
this broke because EclEpsScalingPointsInfo::extractScaled() now
requires the deck and the EclipseState as additional parameters.
2016-10-20 20:01:03 +02:00
Jørgen Kvalsvik
a52724ae97
Update to shared_ptr-less parser interface.
2016-10-20 10:14:41 +02:00
Atgeirr Flø Rasmussen
f889306c05
Undo premature API change adaption.
2016-10-18 15:34:53 +02:00
Andreas Lauser
fabdfbafcb
consolidate the unit system to opm-parser
...
since the unit code within opm-parser is now a drop-in replacement,
this simplifies things and make them less error-prone.
unfortunately, this requires quite a few PRs. (most are pretty
trivial, though.)
2016-10-10 17:50:26 +02:00
Atgeirr Flø Rasmussen
35ce9f5884
Avoid shadowing warning by using explicit scope.
2016-09-23 15:15:17 +02:00
Tor Harald Sandve
fa16d6c172
use table.size() instead of read from deck.
2016-09-16 10:31:41 +02:00
Tor Harald Sandve
b317124d94
Bugfix: Let NTMISC determine number of MISC tables
...
Number of misc tables is given by NTMISC (MISCNUM) and not NTSFUN
(SATNUM)
2016-09-16 10:31:41 +02:00
Tor Harald Sandve
1d7e4146ed
Fixing some nitpicks
2016-06-24 13:36:05 +02:00
Tor Harald Sandve
cc100a6217
Fix bug for OIL-GAS case
...
- Differentiate between active and canonical phase index
2016-06-20 11:14:36 +02:00
Tor Harald Sandve
3247aaa557
Fix reference pressure for oil-water problem
...
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
2016-06-20 10:36:24 +02:00
Liu Ming
73ed34043e
add a blank line.
2016-06-08 09:45:04 +02:00
Liu Ming
d2143970fc
Cleanup the prefix.
2016-05-20 08:54:12 +08:00
Liu Ming
3e3c028581
remove the prefix from raw string, using OpmLog format.
2016-05-19 10:07:36 +08:00
Liu Ming
8564c7b6e9
remove internal counter.
2016-05-19 09:47:57 +08:00
Liu Ming
78a5afde46
remove internal messages container.
2016-05-19 09:28:34 +08:00
Liu Ming
60256d5976
use tag for terminal output control.
2016-05-19 09:22:03 +08:00
Liu Ming
363b9a3795
unify the format.
2016-05-10 14:52:13 +08:00
jokva
8b71d81a14
Merge pull request #994 from pgdr/use-eclipse3dproperties
...
@bska We're merging as-is for now, and we've made a note to replace `shared_ptr` and maintain (and document!) this property. Those changes will obviously be internal and you won't notice a difference.
2016-04-13 11:01:43 +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
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
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
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
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
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