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
Andreas Lauser
2f3cdfd9e0
fix incorrect derivative of rock compressibility w.r.t. pressure
...
since
f(x) = 1 + 0.5*g(x)*g(x)
the derivative is
f'(x) = 0 + 2*0.5*g(x) * g'(x) = g(x)*g'(x)
note that the previous incorrect values do not affect the quality of
the obtained results (if the tolerance of the non-linear solver is
chosen to be small enough), but it may have deteriorated convergence
rates.
2016-07-19 18:19:30 +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
Bård Skaflestad
e444a03f34
Merge pull request #1037 from atgeirr/add-phasepresence-ops
...
Add operator== and operator!= to PhasePresence.
2016-06-15 19:56:11 +02:00
Atgeirr Flø Rasmussen
d065a2c095
Make new ops const.
2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen
b0c6e43cf8
Add operator== and operator!= to PhasePresence.
...
This makes it simpler to write code debugging or inspecting changed phase configurations.
2016-06-15 08:57:20 +02:00
Liu Ming
3179a1bf5d
fix indentation issue.
2016-06-15 11:26:06 +08:00
Liu Ming
f0900e6752
unify output.
2016-06-15 11:24:20 +08:00
Liu Ming
dd26ef620c
add "\n" at the end of the message.
2016-06-13 13:55:01 +08:00
Liu Ming
5fe0452bd5
minor format changes
2016-06-13 13:49:58 +08:00
Liu Ming
35f2559b6c
Output file name and line number.
2016-06-08 09:45:32 +02:00
Liu Ming
73ed34043e
add a blank line.
2016-06-08 09:45:04 +02:00
Andreas Lauser
8a6243962d
rename some variables from "*Lad" to "*Eval"
...
this was an involuntary omission in the "local AD" to "dense AD"
rename...
2016-06-07 11:14:11 +02:00
Andreas Lauser
807261b084
rename "local AD" to "dense AD"
2016-06-03 21:57:48 +02:00
Atgeirr Flø Rasmussen
2faff12696
Merge pull request #1019 from qilicun/log-more-messages
...
Write more messages into OpmLog.
2016-05-26 11:20:49 +02:00
Liu Ming
407c7223f6
fix indentation and messages.
2016-05-23 10:47:26 +08:00
Liu Ming
9979c505b3
log the warning messages to OpmLog.
2016-05-20 14:27:38 +08: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
babrodtk
eabb2e1f64
Runs first iterations of two-phase test case plausibly
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
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
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
