Commit Graph

161 Commits

Author SHA1 Message Date
Joakim Hove
2947336982 Added derived iniitializer classes SWL and ISWL 2015-05-06 12:27:41 +02:00
Joakim Hove
2d08d78257 MOved satfunc initializers to separate file. 2015-05-06 12:27:40 +02:00
Joakim Hove
819e92965f Removed SGL and ISGL lookup from multiplex method 2015-05-06 12:27:40 +02:00
Joakim Hove
5aaf5ea6c2 Added derived class ISGLInitializer 2015-05-06 12:27:39 +02:00
Joakim Hove
5989d45b3a Added derived class SGLInitializer. 2015-05-06 12:27:38 +02:00
Joakim Hove
21951cda90 Added GridProperty<T>::checkLimits() 2015-05-06 12:27:38 +02:00
Joakim Hove
863b5f9441 Refactor: calculation of endpoint + critical 2015-05-06 12:27:37 +02:00
Joakim Hove
c6429c3fe8 Refactor: critcial and enpoint values are members. 2015-05-06 12:27:37 +02:00
Joakim Hove
84e65886fb Refactor: introduced const& and [] instead of at() 2015-05-06 12:27:36 +02:00
Joakim Hove
78408dab59 Refactor: extracted two small methods 2015-05-06 12:27:36 +02:00
Joakim Hove
63e16153c6 Renamed GridPropertyEndpointTableLookupInitializer -> EndpointInitializer 2015-05-06 12:27:35 +02:00
Joakim Hove
c11cca31dc Added comment with reference to documentation. 2015-05-06 12:27:34 +02:00
Joakim Hove
6882653433 Using EclipseState::getIntGridProperty()
Old code used to first initialize with 1, and then check the
EclipseState - will rather just ask the EclipseState; which will
automagically create a keyword if that is required.

Also The SATNUM keyword was previously immediately overwritten with the
content of the ENDNUM keyword, that is now changed.
2015-05-06 12:27:33 +02:00
Joakim Hove
e3d4b205cd Added test before finding critical saturations. 2015-05-06 12:27:32 +02:00
Joakim Hove
1b89196aa1 Using Tabdims in EclipseState and table initializer 2015-05-06 12:27:32 +02:00
Joakim Hove
bf61731536 Added vector based get of Properties 2015-05-05 19:23:06 +02:00
Joakim Hove
f0adb6a2d8 Added C++ wrappers for ERT: ecl_kw and fortio 2015-05-05 17:02:09 +02:00
Joakim Hove
45e13a1b40 Minor changes to silence some warnings. 2015-04-15 22:59:58 +02:00
Joakim Hove
08a7132db8 Merge pull request #398 from joakim-hove/singleton-example
Singleton Logger
2015-03-09 08:08:12 +01:00
Joakim Hove
9fb229ccd7 Replaced references to logger with OpmLog::addMessage() 2015-03-04 22:14:31 +01:00
Joakim Hove
3a60605d99 Removed most of the functionality from CounterLog 2015-03-04 22:12:53 +01:00
Joakim Hove
25bff6480d Renamed MessageCounter -> CounterLog 2015-03-04 22:12:52 +01:00
Joakim Hove
d3277543ec Renamed existing Logger -> MessageCounter 2015-03-04 22:09:54 +01:00
chflo
f3b427121e OPM-157: Added method getGlobalIndex to EclipseGrid, needed from opm-core EclipseWriter 2015-03-04 14:09:43 +01:00
Joakim Hove
f4f163e874 Using defaultRegion for MULTREGTSCANNER 2015-03-04 11:11:15 +01:00
Joakim Hove
e06d14309c Using defaultRegion for xxxREG keywords 2015-03-04 11:11:14 +01:00
Atgeirr Flø Rasmussen
36089420e1 Add missing throw check, also silencing warning. 2015-02-17 10:30:54 +01:00
Fredrik Gundersen
ce5eb28c92 Fix of test after merge of pull request #416 2015-02-12 11:31:09 +01:00
Liu Ming
8f61bcd59a Add MinpvMode namespace and remove the whitespace. 2015-02-12 16:00:31 +08:00
Liu Ming
1dfb337a76 Remove isMinpvActive() function, use getMinpvMode() instead. 2015-02-10 16:45:48 +08:00
Liu Ming
3d0c79a4d9 Create Minpv mode enum. 2015-02-10 16:45:03 +08:00
Liu Ming
785fa97c80 Merge remote-tracking branch 'remotes/opm/master' into add_minpvf 2015-02-09 09:52:40 +08:00
Liu Ming
15164b0e7f Add keyword MINPVF. 2015-02-09 09:52:11 +08:00
Atgeirr Flø Rasmussen
d150107746 Update test for cartesian constructor.
We will now have cell info, even with that one.
2015-01-27 10:41:35 +01:00
Atgeirr Flø Rasmussen
ff80db33ba Improved cartesian convenience constructor.
It now can take cell size arguments, and it always creates a complete grid.
2015-01-27 09:54:10 +01:00
Joakim Hove
e432a1c75a Added getCellDepth() method to EclipseGrid 2015-01-26 12:26:23 +01:00
Joakim Hove
e56a136565 Added support for COPYREG keyword 2014-12-18 18:02:15 +01:00
Joakim Hove
a4620f5ed0 Added support for ADDREG keyword 2014-12-18 18:02:14 +01:00
Joakim Hove
9ddd8e83c0 Added GridProperty::maskedAdd() and maskedCopy() 2014-12-18 18:02:13 +01:00
Joakim Hove
233b9b9e32 Added support for MULTIREG keyword in EclipseState 2014-12-18 18:02:12 +01:00
Joakim Hove
d75c830388 Added GridProperty::maskedMultiply() method 2014-12-18 18:02:11 +01:00
Joakim Hove
ed89b8ee9d Added test for EQUAL. 2014-12-18 18:02:11 +01:00
Joakim Hove
be08d6df2a Added support for EQUALREG in EclipseState 2014-12-18 18:02:10 +01:00
Joakim Hove
06f2715d10 Added method GridProperties::getInitializedKeyword()
The getKeyword() method will autocreate and initialize a keyword if you
ask for one which is supported, but has not yet been accessed. The new
getInitializedkeyword() method will raise an exception if the keyword
has not already been initialized.
2014-12-18 18:02:10 +01:00
Joakim Hove
7588096c08 Added GridProperty::getDimensionString() 2014-12-18 18:02:09 +01:00
Joakim Hove
a100d94608 Added const to GridProperty::containsNan() 2014-12-18 18:02:09 +01:00
Joakim Hove
867fdb2de5 Added maskedSet() and initMask() GridProperties<T> 2014-12-18 18:02:08 +01:00
Joakim Hove
b585655a5c Changes in the log class:
1. Moved to from eclipse/Parser -> eclipse/Log
 2. Renamed ParserLog -> OpmLog
2014-12-15 17:36:10 +01:00
Andreas Lauser
0cba93a283 address the review comment of #373 2014-12-09 12:41:04 +01:00
Tor Harald Sandve
bb40baa96f Make MULTREGT work for NNC.
The region multipliers are no longer added  to the cartesian logical
MULT[XYZ] structure. Instead a new method
getRegionMultiplier(globalIndex1, globalIndex2,FaceDir) is added that
return the multiplier between globalIndex1 cell and globalIndex2 cell.
The face direction is added to support directional dependent MULTREGT
input. This implementation of MULTREGT also supports restricting the
multipliers to only apply for NNC or NONNNC.
2014-12-09 12:14:36 +01:00