OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,827 Commits 18 Branches 75 Tags
e5dbfd9359f1b6eabc86650701d2cc0addf757ca
Commit Graph

201 Commits

Author SHA1 Message Date
Joakim Hove
717821cf90 Changed int -> size_t to squash warnings. 2015-08-28 15:20:44 +02:00
Andreas Lauser
619bd45052 update getSaturationFunctionFamily() for SLGOF 
again, thanks to [at]totto82 for finding this
 2015-08-25 11:48:30 +02:00
Andreas Lauser
c99d0b08d3 implement finding the endpoints for SLGOF 
before the code expected the SGOF tables to be used for family 1.
 2015-08-25 11:32:50 +02:00
Tor Harald Sandve
aa3515fc6a Add phase info to tests 
OIL, GAS and WATER is specified to avoid the 3-phase assert test in
SatfuncPropertyInitializers to fail
 2015-08-19 09:05:10 +02:00
Joakim Hove
bb6537f631 Fixed minor bug. 2015-08-18 16:01:53 +02:00
Tor Harald Sandve
c6ac070b4f Remove print() 2015-08-18 13:34:00 +02:00
Tor Harald Sandve
70835021f7 Fix bug in ISWCR default? 2015-08-17 11:29:16 +02:00
Tor Harald Sandve
f59ca7f392 Support familyII in the SatfuncInitializer 
- Moves saturation function family check from EclipseState to
SatfuncPropertyInitializers
- Add tests in SatfuncPropertyInitializersTests
- Fixes error in the SatfuncPropertyInitializers implementation for
familyII
 2015-08-17 11:29:16 +02:00
Tor Harald Sandve
641ff37832 Support for family 2 is added to the satfunc property initializer 
Now either family I (SWOF,SGOF) or family II (SWFN, SGFN and SOF3)
keywords can be specified.

Other keyword alternatives like SLGOF, SOF2 and SGWFN and the two
dimensional saturation tables are still not supported.
 2015-08-17 11:29:16 +02:00
Atgeirr Flø Rasmussen
3845e1c239 Suppress warnings from boost. 
Done by using the disable_warnings.h and reenable_warnings.h headers.
In some cases also a little reordering of includes, to put all boost
includes in the warning-suppressed part.
 2015-08-10 13:06:50 +02:00
Joakim Hove
2582064c5d Added ParseMode::unsupportedScheduleGeoModifiers 
- Added const ParseMode& argument to EclipseState() and Schedule()
   constructors.
 - Schedule constructor iterates through SCHEDULESection instance
   instead of Deck instance.
 2015-08-06 15:12:48 +02:00
Joakim Hove
733af54777 Added struct ParseMode to control parse behaviour. 
- Introduce a very simple class ParseMode which will become a simple
   value object which can be used to control the behavior when errors
   and inconsistencies are encountered in the parse and EclipseState
   construction phases.

 - Added ParseMode instance as second argument to all parseXXX()
   methods.
 2015-08-05 22:02:09 +02:00
Joakim Hove
6362bd2eb1 Fixed typo. 2015-07-28 09:27:05 +02:00
Joakim Hove
847fc3ba6f Added EclipseGrid::cellThickNess() method 2015-07-27 17:57:34 +02:00
Joakim Hove
d7406273c5 Enforce bitwise equality in ZCORN with full TOPS. 2015-07-24 09:32:54 +02:00
Andreas Lauser
eca9a3016d fix the data of grid property unit test 
critical saturations must always be defined. again thanks to [at]bska
for the hint.
 2015-07-21 13:07:34 +02:00
Andreas Lauser
40bef918a5 SatfuncPropertyInitializer: determine the critical saturations correctly 
At least I hope it's correct: the condition for breaking the loops
where inverted in some places.

thanks to [at]bska for discovering this.
 2015-07-21 13:07:28 +02:00
Atgeirr Flø Rasmussen
3cdc01fbe3 Do not mix signed and unsigned. 2015-07-15 11:15:49 +02:00
Andreas Lauser
d234d37616 grid properties: Add support for three point vertical relperm scaling 
because it seems like the code in opm-core uses this at some point.
 2015-07-09 12:16:08 +02:00
Andreas Lauser
f5c13deb0a add grid properties required for the simple "vertical" endpoint scaling 
i.e., the PC[GW] and KR[OGW] properties plus their imbibition and
directional variants. the properties required for three-point vertical
scaling (i.e., KRWR, et al.) are still to be done.
 2015-07-09 12:16:03 +02:00
Andreas Lauser
16c7fdce6d grid properties: check stricter has*Property() behavior in the unit test 
thanks to [at]joakim-hove for the suggestion.
 2015-07-09 12:16:01 +02:00
Joakim Hove
c38b892876 Moved initialization of FaultCollection. 2015-06-18 08:06:39 +02:00
Joakim Hove
f8bc617894 Changed Deck::getKeywordList: 
The method will return an empty vector - instead of throwing, if you ask
for a missing keyword.
 2015-06-18 08:06:38 +02:00
Tor Harald Sandve
486182b7de Adress minor comments from PR 
1) use addNNC() method to store the NNCs
2) convert all int's to size_t
3) remove .reserve() from the loop
4) use m_xxx instead of xxx_
5) rename xyz1 to ijk1 etc.
 2015-06-11 06:43:25 +02:00
Tor Harald Sandve
5221f273b5 Store the NNC in SI units 2015-06-10 10:23:02 +02:00
Tor Harald Sandve
8a2fed1bf8 Address minor comments 
Change int to size_t
Remove hasNNC_
 2015-06-10 10:23:02 +02:00
Tor Harald Sandve
5cd9a7f7b2 Add NNC class 
This class provides the raw non-neighboring connections data as read
from the deck and/or added using the addNNC method.
The NNC data is currently not processed. I.e. multiple NNC connection
between the same cell can exist side by side.
 2015-06-10 10:23:02 +02:00
Joakim Hove
679ef35d0b Updated code to use compiled defaults 2015-06-08 11:29:21 +02:00
Joakim Hove
fd87b22f7d Added methods to Deck::getKeyword<T>() 2015-06-08 11:29:19 +02:00
Joakim Hove
216e80a845 Fixed wrong include path 2015-05-29 09:55:50 +02:00
Joakim Hove
a3451a4f7f Merge pull request #466 from joakim-hove/remove-ert-cpp 
Removed ERT Cxx wrappers
 2015-05-29 09:22:16 +02:00
Joakim Hove
91826a3ffa Merge pull request #468 from iLoop2/OPM-203 
Added suport for converting of Metric grid values
 2015-05-29 09:22:05 +02:00
Joakim Hove
60eaacb6fe Removed ERT Cxx wrappers 2015-05-27 07:12:41 +02:00
Arne Morten Kvarving
2acd2db5d0 changed: rename Parser to opmparser for consistency 2015-05-26 13:53:54 +02:00
Arne Morten Kvarving
9e96127705 change how tests are added in the build system 
- use a opm-macro to reduce code duplication
- add a 'test-suite' target which builds tests. for use if BUILD_TESTING
  is 0.
- add a 'check' target which builds tests, then executes them
 2015-05-26 13:07:44 +02:00
Fredrik Gundersen
bb97d3f7bb Fix parameter name 2015-05-22 22:58:39 +02:00
Fredrik Gundersen
48699b569a OPM-203 Added supoort for converting of Metric grid values 2015-05-21 12:35:32 +02:00
Joakim Hove
24f49b35a8 Fixed bug 2015-05-06 12:27:43 +02:00
Joakim Hove
10facf19b3 Created classes for all the endpoint initializers. 2015-05-06 12:27:43 +02:00
Joakim Hove
121ec9320b Added ISGU / SGU classes 2015-05-06 12:27:42 +02:00
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