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
Tor Harald Sandve
5641876d1d
Fix two phase EQUIL initialization
2016-06-20 10:36:24 +02:00
Atgeirr Flø Rasmussen
010480a7de
Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned
...
Avoid ambiguous calls to abs with unsigned integers.
2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen
d76cfbed5f
Merge pull request #1038 from qilicun/equil-check
...
Rise up a warning if equil region has no active cells.
2016-06-16 10:02:49 +02:00
Atgeirr Flø Rasmussen
f5d1cbfb75
Make specialization for all unsigned integer types.
2016-06-16 08:47:21 +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
Bård Skaflestad
c5c5893591
Merge pull request #1040 from atgeirr/fix-linsolverfactory-default-solver
...
Set default solver depending on configuration.
2016-06-15 17:34:41 +02:00
Atgeirr Flø Rasmussen
7c45264a77
Merge pull request #1034 from qilicun/minor-format-change
...
Minor format changes
2016-06-15 15:10:57 +02:00
Atgeirr Flø Rasmussen
c6c452765c
Merge pull request #1029 from blattms/make-ownermask-accessible
...
Make ParallelIstlInformation::ownerMask_ accessible.
2016-06-15 15:08:58 +02:00
Atgeirr Flø Rasmussen
854296d710
Address review comments.
2016-06-15 15:01:45 +02:00
Atgeirr Flø Rasmussen
22c2093426
Set default solver depending on configuration.
2016-06-15 14:32:00 +02:00
Atgeirr Flø Rasmussen
06ebdc9268
Avoid ambiguous calls to abs with unsigned integers.
2016-06-15 10:55:42 +02:00
Liu Ming
1231594600
it should be the same number in EQLNUM.
2016-06-15 16:53:51 +08:00
Liu Ming
a9c2128daa
use correct region number.
2016-06-15 16:52:32 +08:00
Liu Ming
a920b43e21
Rise up a warning if equil region has no active cells.
2016-06-15 15:40:38 +08: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
Arne Morten Kvarving
33b29e9991
Revert "Check for HAVE_UMFPACK in LinearSolverFactory"
...
This reverts commit f54c74db0637640f5fb224fab243b294cd034f15.
2016-06-13 10:43:21 +02: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
Jørgen Kvalsvik
84b0c8bc59
Check for HAVE_UMFPACK in LinearSolverFactory
...
Check for the right preprocessor define to enable umfpack support.
Matches the directive set in config.h
2016-06-10 17:00:34 +02:00
Joakim Hove
52752ea1e4
Merge pull request #1016 from jokva/refactor-output-restart
...
Breaking opm-core dependency in opm-output; new summary implementation
2016-06-10 13:15:34 +02:00
Markus Blatt
7762974354
Make ParallelIstlInformation::ownerMask_ accessible.
...
This is needed in opm-simulator to calculate the parallel euclidian
product of the saturations.
2016-06-08 11:02:13 +02:00
Atgeirr Flø Rasmussen
ec3d7e7702
Merge pull request #1028 from qilicun/format-message
...
Format message
2016-06-08 10:57:31 +02: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
Markus Blatt
008c5b7c8f
Added utilities to compute a real L-infinity norm in parallel.
2016-06-07 15:00:57 +02:00
Atgeirr Flø Rasmussen
2d746e8c54
Merge pull request #1024 from andlaus/lad_to_dad
...
rename some variables from "Lad" to "Eval" (was: to "Dad")
2016-06-07 11:43:42 +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
Tor Harald Sandve
2a3680f105
Fix to handle cases without DISGAS and VAPOIL
...
- adds boolean has_disgas and has_vapoil to initHydroCarbonState()
2016-06-07 08:18:09 +02:00
Jørgen Kvalsvik
254bb2e1e6
Make struct wells unique member of WellState
2016-06-06 12:42:54 +02:00
Jørgen Kvalsvik
ec28c46842
WellState::report() to make opm-output Well data
2016-06-06 12:40:44 +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
7d0833f2d2
make toString() method as static.
2016-05-24 09:07:28 +08:00
Liu Ming
ca030efeb9
simplify the implementation.
2016-05-23 10:48:51 +08:00
Liu Ming
407c7223f6
fix indentation and messages.
2016-05-23 10:47:26 +08:00
Liu Ming
1cb66d2b4f
write well related information into OpmLog.
2016-05-20 16:14:16 +08:00
Liu Ming
8c573d4ef1
Add enum to string functions.
2016-05-20 16:13:37 +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
Atgeirr Flø Rasmussen
d1d77649ec
Merge pull request #1011 from qilicun/format-output-relperm-diagnostics
...
Unify output messages format.
2016-05-19 15:06:52 +02: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
Tor Harald Sandve
79fd23700e
Fixing PR comments
...
- Use std::vector<HydroCarbonState> instead of std::vector<int>
- Use the initializer list to initialize members in constructors
- Fix indent
- Return OilOnly for cases without gas to avoid potential trouble
further down the line
2016-05-13 12:49:45 +02:00
Tor Harald Sandve
2a40563c7b
Add method for calculating the initial hydroCarbonState
...
The following hydroCarbonState are used
enum HydroCarbonState {
GasOnly = 0,
GasAndOil = 1,
OilOnly = 2
};
Cells almost filled with water are treated as a GasAndOil state
2016-05-13 09:10:13 +02:00