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
568101a373
use StreamLog to output messages.
2016-05-19 09:48:12 +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
Tor Harald Sandve
592450777e
Add member hydroCarbonState to the BlackoilState
...
The hydroCarbonState is used to store the hydroCarbonState
State 1: Gas only
State 2: Gas and Oil
State 3: Oil only
An empty vector is return at initialization as
no default values are provided by the blackoilstate.
2016-05-12 10:32:39 +02:00
Liu Ming
363b9a3795
unify the format.
2016-05-10 14:52:13 +08:00
Markus Blatt
9f99484347
Prevent dereferencing the end iterator.
...
This happened for empty regions and surfaced when compiling
with "-D_GLIBCXX_DEBUG -DDEBUG -DGLIBCXX_FORCE_NEW".
2016-05-06 21:40:33 +02:00
babrodtk
cae4d39a86
Code cleanup
2016-04-26 07:48:58 +02: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
babrodtk
a93efec0e2
Fixed bug where phase_pos was used instead of phase_used
2016-04-20 09:48:15 +02:00
Pål Grønås Drange
75936c1d9c
Using getInputGrid API from Parser, changed GridManager to no longer accept Deck in constructor
2016-04-20 08:51:10 +02:00
Pål Grønås Drange
dcd45ba397
Fixed major indentation issue---whole file indented arbitrarily
2016-04-19 15:20:34 +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
Tor Harald Sandve
17aed6c181
BUGFIX. Comparison with null pointer
2016-04-15 12:56:04 +02:00
Atgeirr Flø Rasmussen
486633fded
Merge pull request #997 from totto82/Fix_guiderates
...
Bugfix in setup guiderates
2016-04-15 08:46:17 +02:00
Tor Harald Sandve
db7135d7bf
Add COMPDAT to wells_group.data
...
Without COMPDAT the wells will be shut and thus not added to the well
collection.
2016-04-15 08:32:38 +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
Tor Harald Sandve
ddb7ebe114
Bugfix in setup guiderates
...
- Handle shut wells
- Use the groups control type to determine which phase to calculate
the guide rates from. i.e for a ORAT controlled group, calculate the
guide rates from the oil phase well potentials etc.
2016-04-12 13:05:56 +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
eb700248ed
uses new api, made reference instead of copy
2016-04-08 16:31:59 +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
Atgeirr Flø Rasmussen
9558e155c6
Merge pull request #987 from qilicun/refactor-relpermDiagnostics
...
Refactor relperm diagnostics using OpmLog functionalities.
2016-04-04 15:04:44 +02:00
Tor Harald Sandve
092d7c44ff
Minor fixes based on PR comments
...
- fix comments, typos add missing reference arguments.
2016-04-04 08:10:24 +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
Tor Harald Sandve
9c4015dae9
Calculate default guide rates using the well potentials
...
The default guide rates are caculated using the well potentials.
The well potentials are calculated in the simulator and given as input
to the wellsManager.
2016-04-01 15:00:21 +02:00
Liu Ming
939085155e
refactor relperm diagnostics using OpmLog functions.
2016-04-01 12:27:03 +08:00
Tor Harald Sandve
0f6a821903
BUGFIX. Call setupGuideRates before groupcontrol is applied
2016-03-31 09:32:09 +02:00
Atgeirr Flø Rasmussen
734fbfc38d
Implement direct fast field access.
2016-03-29 10:46:14 +02:00
Joakim Hove
a256dc0e5d
Replaced SimulatorState -> SimulationDatacontainer
...
Have removed the SimulatorState base class, and instead replaced with
the SimulationDatacontainer class from opm-common. The SimulatorState
objects were typcially created with a default constructor, and then
explicitly initialized with a SimulatorState::init() method. For the
SimulationDataContainer RAII is employed; the init( ) has been removed -
and there is no default constructor.
2016-03-29 10:44:49 +02:00
chflo
301653de83
Changed include due to OpmLog changed path
2016-03-17 15:59:50 +01:00
Liu Ming
c2622708e4
rename ParseMode as ParseContext.
2016-03-17 09:57:59 +08:00
Liu Ming
b4a9529aed
rename ParseMode in examples folder.
2016-03-17 09:46:12 +08: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